diff --git a/src/Spring/Spring.Aop/Aop/Config/AopNamespaceParser.cs b/src/Spring/Spring.Aop/Aop/Config/AopNamespaceParser.cs index 5fd5d311..9feadf4e 100644 --- a/src/Spring/Spring.Aop/Aop/Config/AopNamespaceParser.cs +++ b/src/Spring/Spring.Aop/Aop/Config/AopNamespaceParser.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects.Factory.Xml; namespace Spring.Aop.Config; diff --git a/src/Spring/Spring.Aop/Aop/Config/AopNamespaceUtils.cs b/src/Spring/Spring.Aop/Aop/Config/AopNamespaceUtils.cs index e96ccd6f..4071ce0c 100644 --- a/src/Spring/Spring.Aop/Aop/Config/AopNamespaceUtils.cs +++ b/src/Spring/Spring.Aop/Aop/Config/AopNamespaceUtils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Xml; using Spring.Aop.Framework.AutoProxy; using Spring.Objects.Factory.Config; @@ -27,8 +21,6 @@ using Spring.Objects.Factory.Support; using Spring.Objects.Factory.Xml; using Spring.Util; -#endregion - namespace Spring.Aop.Config; /// diff --git a/src/Spring/Spring.Aop/Aop/Config/ConfigObjectDefinitionParser.cs b/src/Spring/Spring.Aop/Aop/Config/ConfigObjectDefinitionParser.cs index d092ae04..dfc87d68 100644 --- a/src/Spring/Spring.Aop/Aop/Config/ConfigObjectDefinitionParser.cs +++ b/src/Spring/Spring.Aop/Aop/Config/ConfigObjectDefinitionParser.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Xml; using Spring.Aop.Support; using Spring.Objects.Factory.Config; @@ -48,8 +44,6 @@ public class ConfigObjectDefinitionParser : IObjectDefinitionParser private static readonly string POINTCUT_REF = "pointcut-ref"; - #region IObjectDefinitionParser Members - /// /// Parse the specified XmlElement and register the resulting /// ObjectDefinitions with the IObjectDefinitionRegistry @@ -148,6 +142,4 @@ public class ConfigObjectDefinitionParser : IObjectDefinitionParser AopNamespaceUtils.ForceAutoProxyCreatorToUseDecoratorProxy(parserContext.Registry); } } - - #endregion } diff --git a/src/Spring/Spring.Aop/Aop/Framework/AbstractMethodInvocation.cs b/src/Spring/Spring.Aop/Aop/Framework/AbstractMethodInvocation.cs index f0059f2b..eb8d3313 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/AbstractMethodInvocation.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/AbstractMethodInvocation.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Reflection; using System.Text; using AopAlliance.Intercept; using Spring.Util; -#endregion - namespace Spring.Aop.Framework; /// diff --git a/src/Spring/Spring.Aop/Aop/Framework/Adapter/AdvisorAdapterRegistrationManager.cs b/src/Spring/Spring.Aop/Aop/Framework/Adapter/AdvisorAdapterRegistrationManager.cs index 6942e57e..b3862678 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/Adapter/AdvisorAdapterRegistrationManager.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/Adapter/AdvisorAdapterRegistrationManager.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Objects.Factory.Config; -#endregion - namespace Spring.Aop.Framework.Adapter; /// diff --git a/src/Spring/Spring.Aop/Aop/Framework/Adapter/AfterReturningAdviceAdapter.cs b/src/Spring/Spring.Aop/Aop/Framework/Adapter/AfterReturningAdviceAdapter.cs index afa91d1e..6f65da0a 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/Adapter/AfterReturningAdviceAdapter.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/Adapter/AfterReturningAdviceAdapter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using AopAlliance.Aop; using AopAlliance.Intercept; -#endregion - namespace Spring.Aop.Framework.Adapter; /// diff --git a/src/Spring/Spring.Aop/Aop/Framework/Adapter/AfterReturningAdviceInterceptor.cs b/src/Spring/Spring.Aop/Aop/Framework/Adapter/AfterReturningAdviceInterceptor.cs index 2fde088f..373dd7e3 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/Adapter/AfterReturningAdviceInterceptor.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/Adapter/AfterReturningAdviceInterceptor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using AopAlliance.Intercept; using Spring.Util; -#endregion - namespace Spring.Aop.Framework.Adapter; /// diff --git a/src/Spring/Spring.Aop/Aop/Framework/Adapter/BeforeAdviceAdapter.cs b/src/Spring/Spring.Aop/Aop/Framework/Adapter/BeforeAdviceAdapter.cs index bce90c60..e2fdbec7 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/Adapter/BeforeAdviceAdapter.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/Adapter/BeforeAdviceAdapter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using AopAlliance.Aop; using AopAlliance.Intercept; -#endregion - namespace Spring.Aop.Framework.Adapter; /// diff --git a/src/Spring/Spring.Aop/Aop/Framework/Adapter/DefaultAdvisorAdapterRegistry.cs b/src/Spring/Spring.Aop/Aop/Framework/Adapter/DefaultAdvisorAdapterRegistry.cs index 1c1beba5..a37d06a0 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/Adapter/DefaultAdvisorAdapterRegistry.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/Adapter/DefaultAdvisorAdapterRegistry.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using AopAlliance.Aop; using AopAlliance.Intercept; using Spring.Aop.Support; -#endregion - namespace Spring.Aop.Framework.Adapter; /// diff --git a/src/Spring/Spring.Aop/Aop/Framework/Adapter/GlobalAdvisorAdapterRegistry.cs b/src/Spring/Spring.Aop/Aop/Framework/Adapter/GlobalAdvisorAdapterRegistry.cs index d65a8116..ef504164 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/Adapter/GlobalAdvisorAdapterRegistry.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/Adapter/GlobalAdvisorAdapterRegistry.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Aop.Framework.Adapter; /// @@ -40,10 +36,6 @@ public sealed class GlobalAdvisorAdapterRegistry : DefaultAdvisorAdapterRegistry get { return instance; } } - #region Constructor (s) / Destructor - - // CLOVER:OFF - /// /// Creates a new instance of the /// class. @@ -59,6 +51,4 @@ public sealed class GlobalAdvisorAdapterRegistry : DefaultAdvisorAdapterRegistry } // CLOVER:ON - - #endregion } diff --git a/src/Spring/Spring.Aop/Aop/Framework/Adapter/IAdvisorAdapter.cs b/src/Spring/Spring.Aop/Aop/Framework/Adapter/IAdvisorAdapter.cs index 8e8ceee6..fa1c48d5 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/Adapter/IAdvisorAdapter.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/Adapter/IAdvisorAdapter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using AopAlliance.Aop; using AopAlliance.Intercept; -#endregion - namespace Spring.Aop.Framework.Adapter; /// diff --git a/src/Spring/Spring.Aop/Aop/Framework/Adapter/IAdvisorAdapterRegistry.cs b/src/Spring/Spring.Aop/Aop/Framework/Adapter/IAdvisorAdapterRegistry.cs index 7d87e392..cb77cf72 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/Adapter/IAdvisorAdapterRegistry.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/Adapter/IAdvisorAdapterRegistry.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using AopAlliance.Intercept; -#endregion - namespace Spring.Aop.Framework.Adapter; /// diff --git a/src/Spring/Spring.Aop/Aop/Framework/Adapter/MethodBeforeAdviceInterceptor.cs b/src/Spring/Spring.Aop/Aop/Framework/Adapter/MethodBeforeAdviceInterceptor.cs index 347b7e57..d84f859d 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/Adapter/MethodBeforeAdviceInterceptor.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/Adapter/MethodBeforeAdviceInterceptor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using AopAlliance.Intercept; using Spring.Util; -#endregion - namespace Spring.Aop.Framework.Adapter; /// diff --git a/src/Spring/Spring.Aop/Aop/Framework/Adapter/ThrowsAdviceAdapter.cs b/src/Spring/Spring.Aop/Aop/Framework/Adapter/ThrowsAdviceAdapter.cs index d089b81f..367b6deb 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/Adapter/ThrowsAdviceAdapter.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/Adapter/ThrowsAdviceAdapter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using AopAlliance.Aop; using AopAlliance.Intercept; -#endregion - namespace Spring.Aop.Framework.Adapter; /// diff --git a/src/Spring/Spring.Aop/Aop/Framework/Adapter/ThrowsAdviceInterceptor.cs b/src/Spring/Spring.Aop/Aop/Framework/Adapter/ThrowsAdviceInterceptor.cs index bd37fae5..dcc919f6 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/Adapter/ThrowsAdviceInterceptor.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/Adapter/ThrowsAdviceInterceptor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Reflection; using AopAlliance.Intercept; using Microsoft.Extensions.Logging; using Spring.Util; -#endregion - namespace Spring.Aop.Framework.Adapter; /// Interceptor to wrap an after throwing advice. @@ -161,15 +153,11 @@ public sealed class ThrowsAdviceInterceptor : IMethodInterceptor Type lastParametersType = method.GetParameters()[numParams - 1].ParameterType; if (typeof(Exception).IsAssignableFrom(lastParametersType)) { - #region Instrumentation - if (log.IsEnabled(LogLevel.Debug)) { log.LogDebug("Found exception handler method: " + method); } - #endregion - if (this.exceptionHandlers.Contains(lastParametersType)) { throw new ArgumentException( @@ -263,15 +251,11 @@ public sealed class ThrowsAdviceInterceptor : IMethodInterceptor { Type exceptionClass = exception.GetType(); - #region Instrumentation - if (log.IsEnabled(LogLevel.Debug)) { log.LogDebug("Trying to find handler for exception of type [" + exception.GetType().Name + "]."); } - #endregion - MethodInfo handler = (MethodInfo) this.exceptionHandlers[exceptionClass]; while (handler == null && !exceptionClass.Equals(typeof(Exception))) { diff --git a/src/Spring/Spring.Aop/Aop/Framework/Adapter/UnknownAdviceTypeException.cs b/src/Spring/Spring.Aop/Aop/Framework/Adapter/UnknownAdviceTypeException.cs index 3a31b6c7..8e83164d 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/Adapter/UnknownAdviceTypeException.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/Adapter/UnknownAdviceTypeException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Runtime.Serialization; -#endregion - namespace Spring.Aop.Framework.Adapter; /// diff --git a/src/Spring/Spring.Aop/Aop/Framework/AdvisedSupport.cs b/src/Spring/Spring.Aop/Aop/Framework/AdvisedSupport.cs index 822d38ff..8aa758e0 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/AdvisedSupport.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/AdvisedSupport.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using System.Runtime.Serialization; using System.Text; diff --git a/src/Spring/Spring.Aop/Aop/Framework/AdvisorChainFactoryUtils.cs b/src/Spring/Spring.Aop/Aop/Framework/AdvisorChainFactoryUtils.cs index 05ac2258..28a05277 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/AdvisorChainFactoryUtils.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/AdvisorChainFactoryUtils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using AopAlliance.Intercept; using Spring.Aop.Framework.Adapter; -#endregion - namespace Spring.Aop.Framework; /// @@ -94,10 +86,6 @@ public sealed class AdvisorChainFactoryUtils return interceptors; } - #region Constructor (s) / Destructor - - // CLOVER:OFF - /// /// Creates a new instance of the /// @@ -114,6 +102,4 @@ public sealed class AdvisorChainFactoryUtils } // CLOVER:ON - - #endregion } diff --git a/src/Spring/Spring.Aop/Aop/Framework/AopConfigException.cs b/src/Spring/Spring.Aop/Aop/Framework/AopConfigException.cs index 36aa9eed..46e7c559 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/AopConfigException.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/AopConfigException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Runtime.Serialization; -#endregion - namespace Spring.Aop.Framework; /// diff --git a/src/Spring/Spring.Aop/Aop/Framework/AopContext.cs b/src/Spring/Spring.Aop/Aop/Framework/AopContext.cs index decbaec6..a1160a59 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/AopContext.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/AopContext.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; -#endregion - namespace Spring.Aop.Framework; /// @@ -166,10 +158,6 @@ public sealed class AopContext proxyStack.Pop(); } - #region Constructor (s) / Destructor - - // CLOVER:OFF - /// /// Creates a new instance of the /// class. @@ -184,6 +172,4 @@ public sealed class AopContext } // CLOVER:ON - - #endregion } diff --git a/src/Spring/Spring.Aop/Aop/Framework/AopUtils.cs b/src/Spring/Spring.Aop/Aop/Framework/AopUtils.cs index 1f721f63..338b6062 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/AopUtils.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/AopUtils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using Spring.Collections; using Spring.Util; -#endregion - namespace Spring.Aop.Framework; /// @@ -365,10 +357,6 @@ public sealed class AopUtils return true; } - #region Constructor (s) / Destructor - - // CLOVER:OFF - /// /// Creates a new instance of the /// class. @@ -383,10 +371,6 @@ public sealed class AopUtils { } - // CLOVER:ON - - #endregion - /// /// Gets the type of the target. /// diff --git a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractAdvisorAutoProxyCreator.cs b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractAdvisorAutoProxyCreator.cs index 130c510a..d872861e 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractAdvisorAutoProxyCreator.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractAdvisorAutoProxyCreator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using Spring.Core; using Spring.Objects.Factory; diff --git a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractFilteringAutoProxyCreator.cs b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractFilteringAutoProxyCreator.cs index 41005504..786fde03 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractFilteringAutoProxyCreator.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractFilteringAutoProxyCreator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Aop.Framework.AutoProxy; /// diff --git a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AttributeAutoProxyCreator.cs b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AttributeAutoProxyCreator.cs index a11c9072..29be05b1 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AttributeAutoProxyCreator.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AttributeAutoProxyCreator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Util; -#endregion - namespace Spring.Aop.Framework.AutoProxy; /// diff --git a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/DefaultAdvisorAutoProxyCreator.cs b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/DefaultAdvisorAutoProxyCreator.cs index 4078be15..46a45102 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/DefaultAdvisorAutoProxyCreator.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/DefaultAdvisorAutoProxyCreator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Objects.Factory; -#endregion - namespace Spring.Aop.Framework.AutoProxy; /// @@ -45,8 +37,6 @@ public class DefaultAdvisorAutoProxyCreator : AbstractAdvisorAutoProxyCreator, I private string advisorObjectNamePrefix; private List cachedAdvisors; - #region Properties - /// /// Gets or sets a value indicating whether to exclude /// advisors with a certain prefix. @@ -70,10 +60,6 @@ public class DefaultAdvisorAutoProxyCreator : AbstractAdvisorAutoProxyCreator, I set { advisorObjectNamePrefix = value; } } - #endregion - - #region IObjectNameAware Members - /// /// Set the name of the object in the object factory that created this object. /// @@ -98,8 +84,6 @@ public class DefaultAdvisorAutoProxyCreator : AbstractAdvisorAutoProxyCreator, I } } - #endregion - /// /// Find all possible advisor candidates to use in auto-proxying /// diff --git a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/ITargetSourceCreator.cs b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/ITargetSourceCreator.cs index 51720bd6..d8620fd0 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/ITargetSourceCreator.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/ITargetSourceCreator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Objects.Factory; -#endregion - namespace Spring.Aop.Framework.AutoProxy; /// diff --git a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/InfrastructureAdvisorAutoProxyCreator.cs b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/InfrastructureAdvisorAutoProxyCreator.cs index 571f8052..2146412b 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/InfrastructureAdvisorAutoProxyCreator.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/InfrastructureAdvisorAutoProxyCreator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects.Factory.Config; namespace Spring.Aop.Framework.AutoProxy; diff --git a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/ObjectFactoryAdvisorRetrievalHelper.cs b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/ObjectFactoryAdvisorRetrievalHelper.cs index 5f5853a9..37a29059 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/ObjectFactoryAdvisorRetrievalHelper.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/ObjectFactoryAdvisorRetrievalHelper.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using Spring.Objects.Factory; using Spring.Objects.Factory.Config; diff --git a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/ObjectNameAutoProxyCreator.cs b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/ObjectNameAutoProxyCreator.cs index 6eb0fac2..1799049b 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/ObjectNameAutoProxyCreator.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/ObjectNameAutoProxyCreator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Spring.Objects.Factory; using Spring.Util; diff --git a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/PointcutFilteringAutoProxyCreator.cs b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/PointcutFilteringAutoProxyCreator.cs index 00e534eb..44eb6d30 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/PointcutFilteringAutoProxyCreator.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/PointcutFilteringAutoProxyCreator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Util; -#endregion - namespace Spring.Aop.Framework.AutoProxy; /// diff --git a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/Target/AbstractPrototypeTargetSourceCreator.cs b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/Target/AbstractPrototypeTargetSourceCreator.cs index f01e05b9..3288e89b 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/Target/AbstractPrototypeTargetSourceCreator.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/Target/AbstractPrototypeTargetSourceCreator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using Microsoft.Extensions.Logging; using Spring.Aop.Target; using Spring.Objects.Factory; using Spring.Objects.Factory.Support; -#endregion - namespace Spring.Aop.Framework.AutoProxy.Target; /// @@ -39,8 +31,6 @@ public abstract class AbstractPrototypeTargetSourceCreator : ITargetSourceCreato /// protected readonly ILogger logger = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); - #region ITargetSourceCreator Members - /// /// Create a special TargetSource for the given object, if any. /// @@ -91,8 +81,6 @@ public abstract class AbstractPrototypeTargetSourceCreator : ITargetSourceCreato } } - #endregion - /// /// Creates the prototype target source. /// diff --git a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/TypeNameAutoProxyCreator.cs b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/TypeNameAutoProxyCreator.cs index 3c4354eb..dc9c19e9 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/TypeNameAutoProxyCreator.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/TypeNameAutoProxyCreator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Aop.Support; using Spring.Util; -#endregion - namespace Spring.Aop.Framework.AutoProxy; /// diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicMethodInvocation.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicMethodInvocation.cs index f57d177a..5dc06870 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/DynamicMethodInvocation.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicMethodInvocation.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Reflection; using Spring.Util; using Spring.Reflection.Dynamic; using AopAlliance.Intercept; -#endregion - namespace Spring.Aop.Framework; /// diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/AbstractAopProxyMethodBuilder.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/AbstractAopProxyMethodBuilder.cs index 30c32350..4fc44739 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/AbstractAopProxyMethodBuilder.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/AbstractAopProxyMethodBuilder.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using System.Reflection.Emit; using System.Runtime.Serialization; diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/AbstractAopProxyTypeBuilder.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/AbstractAopProxyTypeBuilder.cs index e18c0dba..f1c851c8 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/AbstractAopProxyTypeBuilder.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/AbstractAopProxyTypeBuilder.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Reflection.Emit; using Spring.Proxy; -#endregion - namespace Spring.Aop.Framework.DynamicProxy; /// @@ -36,8 +28,6 @@ namespace Spring.Aop.Framework.DynamicProxy; public abstract class AbstractAopProxyTypeBuilder : AbstractProxyTypeBuilder, IAopProxyTypeGenerator { - #region IProxyTypeGenerator Members - /// /// Generates the IL instructions that pushes /// the target instance on which calls should be delegated to. @@ -50,10 +40,6 @@ public abstract class AbstractAopProxyTypeBuilder : il.EmitCall(OpCodes.Callvirt, References.GetTargetMethod, null); } - #endregion - - #region IAopProxyTypeGenerator Members - /// /// Generates the IL instructions that pushes /// the current @@ -62,10 +48,6 @@ public abstract class AbstractAopProxyTypeBuilder : /// The IL generator to use. public abstract void PushAdvisedProxy(ILGenerator il); - #endregion - - #region Protected Methods - /// protected override IList GetTypeAttributes(Type type) { @@ -85,6 +67,4 @@ public abstract class AbstractAopProxyTypeBuilder : return attrs; } - - #endregion } diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/BaseAopProxyMethodBuilder.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/BaseAopProxyMethodBuilder.cs index 9e4dbbc9..88250870 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/BaseAopProxyMethodBuilder.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/BaseAopProxyMethodBuilder.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using System.Reflection.Emit; using Spring.Util; diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/BaseCompositionAopProxy.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/BaseCompositionAopProxy.cs index 9f9ed19e..c613a0d2 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/BaseCompositionAopProxy.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/BaseCompositionAopProxy.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Runtime.Serialization; -#endregion - namespace Spring.Aop.Framework.DynamicProxy; /// @@ -34,8 +26,6 @@ namespace Spring.Aop.Framework.DynamicProxy; [Serializable] public abstract class BaseCompositionAopProxy : AdvisedProxy, IAopProxy, ISerializable { - #region Constructor (s) / Destructor - /// /// Default constructor. /// @@ -70,10 +60,6 @@ public abstract class BaseCompositionAopProxy : AdvisedProxy, IAopProxy, ISerial base.GetObjectData(info, context); } - #endregion - - #region IAopProxy Members - /// /// Returns this proxy instance /// @@ -83,10 +69,6 @@ public abstract class BaseCompositionAopProxy : AdvisedProxy, IAopProxy, ISerial return this; } - #endregion - - #region Equal, HashCode and ToString overrides - /// /// Delegate to target object handling of equals method. /// @@ -165,6 +147,4 @@ public abstract class BaseCompositionAopProxy : AdvisedProxy, IAopProxy, ISerial m_targetSource.ReleaseTarget(target); return str; } - - #endregion } diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/CachedAopProxyFactory.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/CachedAopProxyFactory.cs index f45de77c..0a1ea178 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/CachedAopProxyFactory.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/CachedAopProxyFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Text; using System.Collections; using Microsoft.Extensions.Logging; using Spring.Proxy; -#endregion - namespace Spring.Aop.Framework.DynamicProxy; /// @@ -101,22 +93,16 @@ public class CachedAopProxyFactory : DefaultAopProxyFactory } else { - #region Instrumentation - if (logger.IsEnabled(LogLevel.Debug)) { logger.LogDebug("AOP proxy type found in cache for {CacheKey}", cacheKey); } - - #endregion } } return proxyType; } - #region ProxyTypeCacheKey inner class implementation - /// /// Uniquely identifies a proxytype in the cache /// @@ -214,6 +200,4 @@ public class CachedAopProxyFactory : DefaultAopProxyFactory return buffer.ToString(); } } - - #endregion } diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/CompositionAopProxyTypeBuilder.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/CompositionAopProxyTypeBuilder.cs index 41960954..de7b7c43 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/CompositionAopProxyTypeBuilder.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/CompositionAopProxyTypeBuilder.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using System.Reflection.Emit; using System.Runtime.Serialization; diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/DecoratorAopProxyTypeBuilder.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/DecoratorAopProxyTypeBuilder.cs index a4ff0a70..e06e5c18 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/DecoratorAopProxyTypeBuilder.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/DecoratorAopProxyTypeBuilder.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using System.Reflection.Emit; using System.Runtime.Serialization; diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/DefaultAopProxyFactory.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/DefaultAopProxyFactory.cs index dc137d8a..21bbafc6 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/DefaultAopProxyFactory.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/DefaultAopProxyFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using Spring.Proxy; using Spring.Util; diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/IAdvisedProxyMethodBuilder.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/IAdvisedProxyMethodBuilder.cs index 44d39df1..20cba078 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/IAdvisedProxyMethodBuilder.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/IAdvisedProxyMethodBuilder.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection.Emit; using Spring.Proxy; -#endregion - namespace Spring.Aop.Framework.DynamicProxy; /// @@ -34,17 +26,11 @@ namespace Spring.Aop.Framework.DynamicProxy; /// Bruno Baia public class IAdvisedProxyMethodBuilder : TargetProxyMethodBuilder { - #region Fields - /// /// The implementation to use. /// private IAopProxyTypeGenerator _aopProxyGenerator; - #endregion - - #region Constructor(s) / Destructor - /// /// Creates a new instance of the method builder. /// @@ -59,10 +45,6 @@ public class IAdvisedProxyMethodBuilder : TargetProxyMethodBuilder this._aopProxyGenerator = aopProxyGenerator; } - #endregion - - #region Protected Methods - /// /// Generates the IL instructions that pushes /// the target instance on which calls should be delegated to. @@ -72,6 +54,4 @@ public class IAdvisedProxyMethodBuilder : TargetProxyMethodBuilder { _aopProxyGenerator.PushAdvisedProxy(il); } - - #endregion } diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/IAopProxyTypeGenerator.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/IAopProxyTypeGenerator.cs index 965806bc..16d6d545 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/IAopProxyTypeGenerator.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/IAopProxyTypeGenerator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection.Emit; using Spring.Proxy; -#endregion - namespace Spring.Aop.Framework.DynamicProxy; /// diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/InheritanceAopProxyTypeBuilder.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/InheritanceAopProxyTypeBuilder.cs index effdcc62..a55c1447 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/InheritanceAopProxyTypeBuilder.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/InheritanceAopProxyTypeBuilder.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using System.Reflection; using System.Reflection.Emit; diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/IntroductionProxyMethodBuilder.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/IntroductionProxyMethodBuilder.cs index 38723567..940c4d3c 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/IntroductionProxyMethodBuilder.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/IntroductionProxyMethodBuilder.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using System.Reflection.Emit; diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/TargetAopProxyMethodBuilder.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/TargetAopProxyMethodBuilder.cs index d27c6224..312b3397 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/TargetAopProxyMethodBuilder.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/TargetAopProxyMethodBuilder.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using System.Reflection.Emit; diff --git a/src/Spring/Spring.Aop/Aop/Framework/HashtableCachingAdvisorChainFactory.cs b/src/Spring/Spring.Aop/Aop/Framework/HashtableCachingAdvisorChainFactory.cs index be651284..b3045eff 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/HashtableCachingAdvisorChainFactory.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/HashtableCachingAdvisorChainFactory.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using System.Runtime.Serialization; diff --git a/src/Spring/Spring.Aop/Aop/Framework/IAdvised.cs b/src/Spring/Spring.Aop/Aop/Framework/IAdvised.cs index e14c401c..32d3ec94 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/IAdvised.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/IAdvised.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using AopAlliance.Aop; using Spring.Proxy; diff --git a/src/Spring/Spring.Aop/Aop/Framework/IAdvisedSupportListener.cs b/src/Spring/Spring.Aop/Aop/Framework/IAdvisedSupportListener.cs index d02ae011..f773b264 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/IAdvisedSupportListener.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/IAdvisedSupportListener.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Aop.Framework; /// diff --git a/src/Spring/Spring.Aop/Aop/Framework/IAdvisorChainFactory.cs b/src/Spring/Spring.Aop/Aop/Framework/IAdvisorChainFactory.cs index 5bd4d218..a102fd93 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/IAdvisorChainFactory.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/IAdvisorChainFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; -#endregion - namespace Spring.Aop.Framework; /// diff --git a/src/Spring/Spring.Aop/Aop/Framework/IAopProxy.cs b/src/Spring/Spring.Aop/Aop/Framework/IAopProxy.cs index 9915b8cd..f9223a42 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/IAopProxy.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/IAopProxy.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Proxy; -#endregion - namespace Spring.Aop.Framework; /// diff --git a/src/Spring/Spring.Aop/Aop/Framework/IAopProxyFactory.cs b/src/Spring/Spring.Aop/Aop/Framework/IAopProxyFactory.cs index 30f282e1..66a66bd1 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/IAopProxyFactory.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/IAopProxyFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Aop.Framework; /// diff --git a/src/Spring/Spring.Aop/Aop/Framework/ITargetAware.cs b/src/Spring/Spring.Aop/Aop/Framework/ITargetAware.cs index 629c42d8..dde844cc 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/ITargetAware.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/ITargetAware.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Aop.Framework; /// diff --git a/src/Spring/Spring.Aop/Aop/Framework/InterceptorAndDynamicMethodMatcher.cs b/src/Spring/Spring.Aop/Aop/Framework/InterceptorAndDynamicMethodMatcher.cs index caf33e75..1b80c357 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/InterceptorAndDynamicMethodMatcher.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/InterceptorAndDynamicMethodMatcher.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using AopAlliance.Intercept; namespace Spring.Aop.Framework; diff --git a/src/Spring/Spring.Aop/Aop/Framework/ProxyFactory.cs b/src/Spring/Spring.Aop/Aop/Framework/ProxyFactory.cs index 15a8fcc8..faa43133 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/ProxyFactory.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/ProxyFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using AopAlliance.Intercept; diff --git a/src/Spring/Spring.Aop/Aop/Framework/ReflectiveMethodInvocation.cs b/src/Spring/Spring.Aop/Aop/Framework/ReflectiveMethodInvocation.cs index 6036f324..a49ba379 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/ReflectiveMethodInvocation.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/ReflectiveMethodInvocation.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Reflection; using Spring.Util; using AopAlliance.Intercept; -#endregion - namespace Spring.Aop.Framework; /// diff --git a/src/Spring/Spring.Aop/Aop/IAdvisor.cs b/src/Spring/Spring.Aop/Aop/IAdvisor.cs index 9fa75b0c..ad002415 100644 --- a/src/Spring/Spring.Aop/Aop/IAdvisor.cs +++ b/src/Spring/Spring.Aop/Aop/IAdvisor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using AopAlliance.Aop; -#endregion - namespace Spring.Aop; /// diff --git a/src/Spring/Spring.Aop/Aop/IAdvisors.cs b/src/Spring/Spring.Aop/Aop/IAdvisors.cs index affdb2b2..6915d005 100644 --- a/src/Spring/Spring.Aop/Aop/IAdvisors.cs +++ b/src/Spring/Spring.Aop/Aop/IAdvisors.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Aop; /// diff --git a/src/Spring/Spring.Aop/Aop/IAfterReturningAdvice.cs b/src/Spring/Spring.Aop/Aop/IAfterReturningAdvice.cs index 28277f54..3e8669b5 100644 --- a/src/Spring/Spring.Aop/Aop/IAfterReturningAdvice.cs +++ b/src/Spring/Spring.Aop/Aop/IAfterReturningAdvice.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using AopAlliance.Aop; -#endregion - namespace Spring.Aop; /// diff --git a/src/Spring/Spring.Aop/Aop/IBeforeAdvice.cs b/src/Spring/Spring.Aop/Aop/IBeforeAdvice.cs index 1f663296..ed556adf 100644 --- a/src/Spring/Spring.Aop/Aop/IBeforeAdvice.cs +++ b/src/Spring/Spring.Aop/Aop/IBeforeAdvice.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using AopAlliance.Aop; -#endregion - namespace Spring.Aop; /// diff --git a/src/Spring/Spring.Aop/Aop/IIntroductionAdvisor.cs b/src/Spring/Spring.Aop/Aop/IIntroductionAdvisor.cs index 3d95d043..737aa319 100644 --- a/src/Spring/Spring.Aop/Aop/IIntroductionAdvisor.cs +++ b/src/Spring/Spring.Aop/Aop/IIntroductionAdvisor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Aop; /// diff --git a/src/Spring/Spring.Aop/Aop/IIntroductionInterceptor.cs b/src/Spring/Spring.Aop/Aop/IIntroductionInterceptor.cs index 2a27f087..4c473d62 100644 --- a/src/Spring/Spring.Aop/Aop/IIntroductionInterceptor.cs +++ b/src/Spring/Spring.Aop/Aop/IIntroductionInterceptor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using AopAlliance.Intercept; -#endregion - namespace Spring.Aop; /// diff --git a/src/Spring/Spring.Aop/Aop/IMethodBeforeAdvice.cs b/src/Spring/Spring.Aop/Aop/IMethodBeforeAdvice.cs index 9b20ed4f..5f461e7c 100644 --- a/src/Spring/Spring.Aop/Aop/IMethodBeforeAdvice.cs +++ b/src/Spring/Spring.Aop/Aop/IMethodBeforeAdvice.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; -#endregion - namespace Spring.Aop; /// diff --git a/src/Spring/Spring.Aop/Aop/IMethodMatcher.cs b/src/Spring/Spring.Aop/Aop/IMethodMatcher.cs index eef85187..63311a62 100644 --- a/src/Spring/Spring.Aop/Aop/IMethodMatcher.cs +++ b/src/Spring/Spring.Aop/Aop/IMethodMatcher.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; -#endregion - namespace Spring.Aop; /// diff --git a/src/Spring/Spring.Aop/Aop/IPointcut.cs b/src/Spring/Spring.Aop/Aop/IPointcut.cs index 30969ff9..272f894f 100644 --- a/src/Spring/Spring.Aop/Aop/IPointcut.cs +++ b/src/Spring/Spring.Aop/Aop/IPointcut.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Aop; /// diff --git a/src/Spring/Spring.Aop/Aop/IPointcutAdvisor.cs b/src/Spring/Spring.Aop/Aop/IPointcutAdvisor.cs index b200c1c7..f5b148f4 100644 --- a/src/Spring/Spring.Aop/Aop/IPointcutAdvisor.cs +++ b/src/Spring/Spring.Aop/Aop/IPointcutAdvisor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Aop; /// diff --git a/src/Spring/Spring.Aop/Aop/ITargetSource.cs b/src/Spring/Spring.Aop/Aop/ITargetSource.cs index 2a9c1abd..ecfefb0a 100644 --- a/src/Spring/Spring.Aop/Aop/ITargetSource.cs +++ b/src/Spring/Spring.Aop/Aop/ITargetSource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Aop; /// diff --git a/src/Spring/Spring.Aop/Aop/IThrowsAdvice.cs b/src/Spring/Spring.Aop/Aop/IThrowsAdvice.cs index 7564eafb..37ed9374 100644 --- a/src/Spring/Spring.Aop/Aop/IThrowsAdvice.cs +++ b/src/Spring/Spring.Aop/Aop/IThrowsAdvice.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using AopAlliance.Aop; -#endregion - namespace Spring.Aop; /// diff --git a/src/Spring/Spring.Aop/Aop/ITypeFilter.cs b/src/Spring/Spring.Aop/Aop/ITypeFilter.cs index 5d41fbd0..6f827f13 100644 --- a/src/Spring/Spring.Aop/Aop/ITypeFilter.cs +++ b/src/Spring/Spring.Aop/Aop/ITypeFilter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Aop; /// diff --git a/src/Spring/Spring.Aop/Aop/Support/AbstractGenericPointcutAdvisor.cs b/src/Spring/Spring.Aop/Aop/Support/AbstractGenericPointcutAdvisor.cs index 302920b8..b3a951da 100644 --- a/src/Spring/Spring.Aop/Aop/Support/AbstractGenericPointcutAdvisor.cs +++ b/src/Spring/Spring.Aop/Aop/Support/AbstractGenericPointcutAdvisor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using AopAlliance.Aop; namespace Spring.Aop.Support; diff --git a/src/Spring/Spring.Aop/Aop/Support/AbstractObjectFactoryPointcutAdvisor.cs b/src/Spring/Spring.Aop/Aop/Support/AbstractObjectFactoryPointcutAdvisor.cs index f9ecec5d..cb3d8741 100644 --- a/src/Spring/Spring.Aop/Aop/Support/AbstractObjectFactoryPointcutAdvisor.cs +++ b/src/Spring/Spring.Aop/Aop/Support/AbstractObjectFactoryPointcutAdvisor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using AopAlliance.Aop; using Spring.Objects.Factory; using Spring.Util; @@ -60,8 +56,6 @@ public abstract class AbstractObjectFactoryPointcutAdvisor : AbstractPointcutAdv set { adviceObjectName = value; } } - #region IObjectFactoryAware Members - /// /// Callback that supplies the owning factory to an object instance. /// @@ -86,8 +80,6 @@ public abstract class AbstractObjectFactoryPointcutAdvisor : AbstractPointcutAdv set { objectFactory = value; } } - #endregion - /// /// Return the advice part of this aspect. /// diff --git a/src/Spring/Spring.Aop/Aop/Support/AttributeMatchMethodPointcut.cs b/src/Spring/Spring.Aop/Aop/Support/AttributeMatchMethodPointcut.cs index b22f359f..7c32d3ee 100644 --- a/src/Spring/Spring.Aop/Aop/Support/AttributeMatchMethodPointcut.cs +++ b/src/Spring/Spring.Aop/Aop/Support/AttributeMatchMethodPointcut.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using System.Runtime.Serialization; using Spring.Util; -#endregion - namespace Spring.Aop.Support; /// diff --git a/src/Spring/Spring.Aop/Aop/Support/AttributeMatchMethodPointcutAdvisor.cs b/src/Spring/Spring.Aop/Aop/Support/AttributeMatchMethodPointcutAdvisor.cs index 76c6e76b..3930913b 100644 --- a/src/Spring/Spring.Aop/Aop/Support/AttributeMatchMethodPointcutAdvisor.cs +++ b/src/Spring/Spring.Aop/Aop/Support/AttributeMatchMethodPointcutAdvisor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Runtime.Serialization; using AopAlliance.Aop; using Spring.Core; -#endregion - namespace Spring.Aop.Support; /// diff --git a/src/Spring/Spring.Aop/Aop/Support/AttributeMatchingPointcut.cs b/src/Spring/Spring.Aop/Aop/Support/AttributeMatchingPointcut.cs index 43969239..571b15f9 100644 --- a/src/Spring/Spring.Aop/Aop/Support/AttributeMatchingPointcut.cs +++ b/src/Spring/Spring.Aop/Aop/Support/AttributeMatchingPointcut.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Util; namespace Spring.Aop.Support; diff --git a/src/Spring/Spring.Aop/Aop/Support/AttributeMethodMatcher.cs b/src/Spring/Spring.Aop/Aop/Support/AttributeMethodMatcher.cs index 35f1492c..1fb01cec 100644 --- a/src/Spring/Spring.Aop/Aop/Support/AttributeMethodMatcher.cs +++ b/src/Spring/Spring.Aop/Aop/Support/AttributeMethodMatcher.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using System.Runtime.Serialization; using Spring.Util; diff --git a/src/Spring/Spring.Aop/Aop/Support/AttributeTypeFilter.cs b/src/Spring/Spring.Aop/Aop/Support/AttributeTypeFilter.cs index c572fd0f..75050768 100644 --- a/src/Spring/Spring.Aop/Aop/Support/AttributeTypeFilter.cs +++ b/src/Spring/Spring.Aop/Aop/Support/AttributeTypeFilter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Util; namespace Spring.Aop.Support; @@ -65,8 +61,6 @@ public class AttributeTypeFilter : ITypeFilter /// if set to true [check inherited]. public AttributeTypeFilter(Type attributeType, bool checkInherited) { - #region parameter validation - AssertUtils.ArgumentNotNull(attributeType, "attributeType"); if (!typeof(Attribute).IsAssignableFrom(attributeType)) { @@ -76,8 +70,6 @@ public class AttributeTypeFilter : ITypeFilter attributeType)); } - #endregion - this.attributeType = attributeType; this.checkInherited = checkInherited; } diff --git a/src/Spring/Spring.Aop/Aop/Support/ComposablePointcut.cs b/src/Spring/Spring.Aop/Aop/Support/ComposablePointcut.cs index ade85213..04b42f80 100644 --- a/src/Spring/Spring.Aop/Aop/Support/ComposablePointcut.cs +++ b/src/Spring/Spring.Aop/Aop/Support/ComposablePointcut.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Aop.Support; /// diff --git a/src/Spring/Spring.Aop/Aop/Support/DefaultIntroductionAdvisor.cs b/src/Spring/Spring.Aop/Aop/Support/DefaultIntroductionAdvisor.cs index c46ede95..1497525b 100644 --- a/src/Spring/Spring.Aop/Aop/Support/DefaultIntroductionAdvisor.cs +++ b/src/Spring/Spring.Aop/Aop/Support/DefaultIntroductionAdvisor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using AopAlliance.Aop; using Spring.Collections; -#endregion - namespace Spring.Aop.Support; /// diff --git a/src/Spring/Spring.Aop/Aop/Support/DefaultObjectFactoryPointcutAdvisor.cs b/src/Spring/Spring.Aop/Aop/Support/DefaultObjectFactoryPointcutAdvisor.cs index 92af6bbb..922f4839 100644 --- a/src/Spring/Spring.Aop/Aop/Support/DefaultObjectFactoryPointcutAdvisor.cs +++ b/src/Spring/Spring.Aop/Aop/Support/DefaultObjectFactoryPointcutAdvisor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Aop.Support; /// diff --git a/src/Spring/Spring.Aop/Aop/Support/DefaultPointcutAdvisor.cs b/src/Spring/Spring.Aop/Aop/Support/DefaultPointcutAdvisor.cs index 90b77924..57ab36b7 100644 --- a/src/Spring/Spring.Aop/Aop/Support/DefaultPointcutAdvisor.cs +++ b/src/Spring/Spring.Aop/Aop/Support/DefaultPointcutAdvisor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using AopAlliance.Aop; -#endregion - namespace Spring.Aop.Support; /// diff --git a/src/Spring/Spring.Aop/Aop/Support/DynamicMethodMatcher.cs b/src/Spring/Spring.Aop/Aop/Support/DynamicMethodMatcher.cs index 3127c2b2..066faa69 100644 --- a/src/Spring/Spring.Aop/Aop/Support/DynamicMethodMatcher.cs +++ b/src/Spring/Spring.Aop/Aop/Support/DynamicMethodMatcher.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; -#endregion - namespace Spring.Aop.Support; /// @@ -35,8 +27,6 @@ namespace Spring.Aop.Support; [Serializable] public abstract class DynamicMethodMatcher : IMethodMatcher { - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// @@ -52,8 +42,6 @@ public abstract class DynamicMethodMatcher : IMethodMatcher { } - #endregion - /// /// Is this dynamic? /// diff --git a/src/Spring/Spring.Aop/Aop/Support/DynamicMethodMatcherPointcutAdvisor.cs b/src/Spring/Spring.Aop/Aop/Support/DynamicMethodMatcherPointcutAdvisor.cs index 6b966170..ab508a1a 100644 --- a/src/Spring/Spring.Aop/Aop/Support/DynamicMethodMatcherPointcutAdvisor.cs +++ b/src/Spring/Spring.Aop/Aop/Support/DynamicMethodMatcherPointcutAdvisor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using AopAlliance.Aop; using Spring.Core; -#endregion - namespace Spring.Aop.Support; /// diff --git a/src/Spring/Spring.Aop/Aop/Support/MethodMatchers.cs b/src/Spring/Spring.Aop/Aop/Support/MethodMatchers.cs index f6565f54..15b8b8bd 100644 --- a/src/Spring/Spring.Aop/Aop/Support/MethodMatchers.cs +++ b/src/Spring/Spring.Aop/Aop/Support/MethodMatchers.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; -#endregion - namespace Spring.Aop.Support; /// @@ -85,8 +77,6 @@ public sealed class MethodMatchers return new IntersectionMethodMatcher(firstMatcher, secondMatcher); } - #region Inner Class : UnionMethodMatcher - [Serializable] private sealed class UnionMethodMatcher : IMethodMatcher { @@ -115,10 +105,6 @@ public sealed class MethodMatchers } } - #endregion - - #region Inner Class : IntersectionMethodMatcher - [Serializable] private sealed class IntersectionMethodMatcher : IMethodMatcher { @@ -152,12 +138,6 @@ public sealed class MethodMatchers } } - #endregion - - #region Constructor (s) / Destructor - - // CLOVER:OFF - /// /// Creates a new instance of the /// class. @@ -173,6 +153,4 @@ public sealed class MethodMatchers } // CLOVER:ON - - #endregion } diff --git a/src/Spring/Spring.Aop/Aop/Support/NameMatchMethodPointcut.cs b/src/Spring/Spring.Aop/Aop/Support/NameMatchMethodPointcut.cs index 8d389074..04d606cd 100644 --- a/src/Spring/Spring.Aop/Aop/Support/NameMatchMethodPointcut.cs +++ b/src/Spring/Spring.Aop/Aop/Support/NameMatchMethodPointcut.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using Spring.Util; -#endregion - namespace Spring.Aop.Support; /// diff --git a/src/Spring/Spring.Aop/Aop/Support/NameMatchMethodPointcutAdvisor.cs b/src/Spring/Spring.Aop/Aop/Support/NameMatchMethodPointcutAdvisor.cs index 0e5c2263..00feb401 100644 --- a/src/Spring/Spring.Aop/Aop/Support/NameMatchMethodPointcutAdvisor.cs +++ b/src/Spring/Spring.Aop/Aop/Support/NameMatchMethodPointcutAdvisor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using AopAlliance.Aop; using Spring.Util; -#endregion - namespace Spring.Aop.Support; /// @@ -39,8 +31,6 @@ public class NameMatchMethodPointcutAdvisor : AbstractGenericPointcutAdvisor { private NameMatchMethodPointcut pointcut = new NameMatchMethodPointcut(); - #region Constructor(s) - /// /// Creates a new instance of the /// class. @@ -60,10 +50,6 @@ public class NameMatchMethodPointcutAdvisor : AbstractGenericPointcutAdvisor Advice = advice; } - #endregion - - #region Properties - /// /// The for this pointcut. /// @@ -121,6 +107,4 @@ public class NameMatchMethodPointcutAdvisor : AbstractGenericPointcutAdvisor pointcut = value as NameMatchMethodPointcut; } } - - #endregion } diff --git a/src/Spring/Spring.Aop/Aop/Support/Pointcuts.cs b/src/Spring/Spring.Aop/Aop/Support/Pointcuts.cs index 28b22b05..0faaa196 100644 --- a/src/Spring/Spring.Aop/Aop/Support/Pointcuts.cs +++ b/src/Spring/Spring.Aop/Aop/Support/Pointcuts.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; -#endregion - namespace Spring.Aop.Support; /// @@ -121,10 +113,6 @@ public sealed class Pointcuts && firstPointcut.MethodMatcher == secondPointcut.MethodMatcher; } - #region Constructor (s) / Destructor - - // CLOVER:OFF - /// /// Creates a new instance of the /// class. @@ -140,6 +128,4 @@ public sealed class Pointcuts } // CLOVER:ON - - #endregion } diff --git a/src/Spring/Spring.Aop/Aop/Support/RegularExpressionMethodPointcutAdvisor.cs b/src/Spring/Spring.Aop/Aop/Support/RegularExpressionMethodPointcutAdvisor.cs index d67111b0..31f9044b 100644 --- a/src/Spring/Spring.Aop/Aop/Support/RegularExpressionMethodPointcutAdvisor.cs +++ b/src/Spring/Spring.Aop/Aop/Support/RegularExpressionMethodPointcutAdvisor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using AopAlliance.Aop; using Spring.Util; -#endregion - namespace Spring.Aop.Support; /// @@ -62,8 +54,6 @@ public class RegularExpressionMethodPointcutAdvisor : AbstractGenericPointcutAdv { private AbstractRegularExpressionMethodPointcut pointcut; - #region Constructors - /// /// Creates a new instance of the /// class. @@ -85,10 +75,6 @@ public class RegularExpressionMethodPointcutAdvisor : AbstractGenericPointcutAdv InitPointcut(); } - #endregion - - #region Properties - /// /// A single pattern to be used during method evaluation. /// @@ -127,8 +113,6 @@ public class RegularExpressionMethodPointcutAdvisor : AbstractGenericPointcutAdv } } - #endregion - /// /// Initialises the pointcut. /// diff --git a/src/Spring/Spring.Aop/Aop/Support/RootTypeFilter.cs b/src/Spring/Spring.Aop/Aop/Support/RootTypeFilter.cs index 7c54023c..a203d7c1 100644 --- a/src/Spring/Spring.Aop/Aop/Support/RootTypeFilter.cs +++ b/src/Spring/Spring.Aop/Aop/Support/RootTypeFilter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Util; -#endregion - namespace Spring.Aop.Support; /// diff --git a/src/Spring/Spring.Aop/Aop/Support/StaticMethodMatcher.cs b/src/Spring/Spring.Aop/Aop/Support/StaticMethodMatcher.cs index c43f49d6..2e224c86 100644 --- a/src/Spring/Spring.Aop/Aop/Support/StaticMethodMatcher.cs +++ b/src/Spring/Spring.Aop/Aop/Support/StaticMethodMatcher.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using System.Runtime.Serialization; -#endregion - namespace Spring.Aop.Support; /// diff --git a/src/Spring/Spring.Aop/Aop/Support/StaticMethodMatcherPointcut.cs b/src/Spring/Spring.Aop/Aop/Support/StaticMethodMatcherPointcut.cs index fa36e639..6a5eec9f 100644 --- a/src/Spring/Spring.Aop/Aop/Support/StaticMethodMatcherPointcut.cs +++ b/src/Spring/Spring.Aop/Aop/Support/StaticMethodMatcherPointcut.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Aop.Support; /// diff --git a/src/Spring/Spring.Aop/Aop/Support/StaticMethodMatcherPointcutAdvisor.cs b/src/Spring/Spring.Aop/Aop/Support/StaticMethodMatcherPointcutAdvisor.cs index cc7b41ff..246660fc 100644 --- a/src/Spring/Spring.Aop/Aop/Support/StaticMethodMatcherPointcutAdvisor.cs +++ b/src/Spring/Spring.Aop/Aop/Support/StaticMethodMatcherPointcutAdvisor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using AopAlliance.Aop; using Spring.Core; -#endregion - namespace Spring.Aop.Support; /// diff --git a/src/Spring/Spring.Aop/Aop/Support/TypeFilters.cs b/src/Spring/Spring.Aop/Aop/Support/TypeFilters.cs index bec0b888..b60f9253 100644 --- a/src/Spring/Spring.Aop/Aop/Support/TypeFilters.cs +++ b/src/Spring/Spring.Aop/Aop/Support/TypeFilters.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Aop.Support; /// @@ -133,10 +125,6 @@ public sealed class TypeFilters } } - #region Constructor (s) / Destructor - - // CLOVER:OFF - /// /// Creates a new instance of the /// class. @@ -151,6 +139,4 @@ public sealed class TypeFilters } // CLOVER:ON - - #endregion } diff --git a/src/Spring/Spring.Aop/Aop/Support/TypeNameTypeFilter.cs b/src/Spring/Spring.Aop/Aop/Support/TypeNameTypeFilter.cs index 211590e0..ade3b79b 100644 --- a/src/Spring/Spring.Aop/Aop/Support/TypeNameTypeFilter.cs +++ b/src/Spring/Spring.Aop/Aop/Support/TypeNameTypeFilter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Util; -#endregion - namespace Spring.Aop.Support; /// diff --git a/src/Spring/Spring.Aop/Aop/Support/UnionPointcut.cs b/src/Spring/Spring.Aop/Aop/Support/UnionPointcut.cs index b7cabc92..a36a8041 100644 --- a/src/Spring/Spring.Aop/Aop/Support/UnionPointcut.cs +++ b/src/Spring/Spring.Aop/Aop/Support/UnionPointcut.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; -#endregion - namespace Spring.Aop.Support; /// diff --git a/src/Spring/Spring.Aop/Aop/Target/AbstractPoolingTargetSource.cs b/src/Spring/Spring.Aop/Aop/Target/AbstractPoolingTargetSource.cs index 49760b22..bae8f1d5 100644 --- a/src/Spring/Spring.Aop/Aop/Target/AbstractPoolingTargetSource.cs +++ b/src/Spring/Spring.Aop/Aop/Target/AbstractPoolingTargetSource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using AopAlliance.Aop; using Spring.Aop.Support; using Spring.Objects; using Spring.Objects.Factory; -#endregion - namespace Spring.Aop.Target; /// @@ -69,8 +61,6 @@ namespace Spring.Aop.Target; public abstract class AbstractPoolingTargetSource : AbstractPrototypeTargetSource, PoolingConfig, IDisposable, IAdvice { - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// @@ -86,8 +76,6 @@ public abstract class AbstractPoolingTargetSource { } - #endregion - /// /// Returns the target object (acquired from the pool). /// diff --git a/src/Spring/Spring.Aop/Aop/Target/AbstractPrototypeTargetSource.cs b/src/Spring/Spring.Aop/Aop/Target/AbstractPrototypeTargetSource.cs index 231f6a29..d30a9926 100644 --- a/src/Spring/Spring.Aop/Aop/Target/AbstractPrototypeTargetSource.cs +++ b/src/Spring/Spring.Aop/Aop/Target/AbstractPrototypeTargetSource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using Microsoft.Extensions.Logging; using Spring.Objects.Factory; using Spring.Util; -#endregion - namespace Spring.Aop.Target; /// @@ -46,8 +38,6 @@ namespace Spring.Aop.Target; public abstract class AbstractPrototypeTargetSource : ITargetSource, IObjectFactoryAware, IInitializingObject { - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// @@ -63,10 +53,6 @@ public abstract class AbstractPrototypeTargetSource { } - #endregion - - #region Properties - /// /// The name of the target object to be created on each invocation. /// @@ -135,8 +121,6 @@ public abstract class AbstractPrototypeTargetSource "Singleton object; instances would not be independent."); } - #region Instrumentation - if (logger.IsEnabled(LogLevel.Debug)) { logger.LogDebug(string.Format( @@ -144,23 +128,15 @@ public abstract class AbstractPrototypeTargetSource TargetObjectName)); } - #endregion - _targetType = _owningObjectFactory.GetType(TargetObjectName); } } - #endregion - - #region Methods - /// /// Subclasses should use this method to create a new prototype instance. /// protected virtual object NewPrototypeInstance() { - #region Instrumentation - if (logger.IsEnabled(LogLevel.Debug)) { logger.LogDebug(string.Format( @@ -168,8 +144,6 @@ public abstract class AbstractPrototypeTargetSource TargetObjectName)); } - #endregion - return ObjectFactory.GetObject(TargetObjectName); } @@ -217,10 +191,6 @@ public abstract class AbstractPrototypeTargetSource "The 'TargetObjectName' property must have a value."); } - #endregion - - #region Fields - /// /// Returns a textual representation of this target source instance. /// This implementation returns @@ -246,6 +216,4 @@ public abstract class AbstractPrototypeTargetSource private String _targetObjectName; private IObjectFactory _owningObjectFactory; private Type _targetType; - - #endregion } diff --git a/src/Spring/Spring.Aop/Aop/Target/EmptyTargetSource.cs b/src/Spring/Spring.Aop/Aop/Target/EmptyTargetSource.cs index af5af6a2..b3032900 100644 --- a/src/Spring/Spring.Aop/Aop/Target/EmptyTargetSource.cs +++ b/src/Spring/Spring.Aop/Aop/Target/EmptyTargetSource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Runtime.Serialization; using System.Security.Permissions; -#endregion - namespace Spring.Aop.Target; /// diff --git a/src/Spring/Spring.Aop/Aop/Target/HotSwappableTargetSource.cs b/src/Spring/Spring.Aop/Aop/Target/HotSwappableTargetSource.cs index 1963b08e..326a28fa 100644 --- a/src/Spring/Spring.Aop/Aop/Target/HotSwappableTargetSource.cs +++ b/src/Spring/Spring.Aop/Aop/Target/HotSwappableTargetSource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Util; -#endregion - namespace Spring.Aop.Target; /// diff --git a/src/Spring/Spring.Aop/Aop/Target/IThreadLocalTargetSourceStats.cs b/src/Spring/Spring.Aop/Aop/Target/IThreadLocalTargetSourceStats.cs index ba3b12f6..af0421a7 100644 --- a/src/Spring/Spring.Aop/Aop/Target/IThreadLocalTargetSourceStats.cs +++ b/src/Spring/Spring.Aop/Aop/Target/IThreadLocalTargetSourceStats.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using AopAlliance.Intercept; -#endregion - namespace Spring.Aop.Target; /// diff --git a/src/Spring/Spring.Aop/Aop/Target/PoolingConfig.cs b/src/Spring/Spring.Aop/Aop/Target/PoolingConfig.cs index f2b98b63..0849f088 100644 --- a/src/Spring/Spring.Aop/Aop/Target/PoolingConfig.cs +++ b/src/Spring/Spring.Aop/Aop/Target/PoolingConfig.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Aop.Target; /// diff --git a/src/Spring/Spring.Aop/Aop/Target/PrototypeTargetSource.cs b/src/Spring/Spring.Aop/Aop/Target/PrototypeTargetSource.cs index cc59061a..d4eb9586 100644 --- a/src/Spring/Spring.Aop/Aop/Target/PrototypeTargetSource.cs +++ b/src/Spring/Spring.Aop/Aop/Target/PrototypeTargetSource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Aop.Target; /// diff --git a/src/Spring/Spring.Aop/Aop/Target/SimplePoolTargetSource.cs b/src/Spring/Spring.Aop/Aop/Target/SimplePoolTargetSource.cs index 0dbb6dec..03eaba46 100644 --- a/src/Spring/Spring.Aop/Aop/Target/SimplePoolTargetSource.cs +++ b/src/Spring/Spring.Aop/Aop/Target/SimplePoolTargetSource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using Microsoft.Extensions.Logging; using Spring.Objects.Factory; using Spring.Pool; using Spring.Pool.Support; -#endregion - namespace Spring.Aop.Target; /// @@ -65,15 +57,11 @@ public class SimplePoolTargetSource : AbstractPoolingTargetSource, IPoolableObje /// protected override void CreatePool(IObjectFactory factory) { - #region Instrumentation - if (logger.IsEnabled(LogLevel.Debug)) { logger.LogDebug("Creating object pool."); } - #endregion - this.objectPool = CreateObjectPool(); } @@ -134,15 +122,11 @@ public class SimplePoolTargetSource : AbstractPoolingTargetSource, IPoolableObje /// public override void Dispose() { - #region Instrumentation - if (logger.IsEnabled(LogLevel.Debug)) { logger.LogDebug("Closing pool..."); } - #endregion - this.objectPool.Close(); } diff --git a/src/Spring/Spring.Aop/Aop/Target/ThreadLocalTargetSource.cs b/src/Spring/Spring.Aop/Aop/Target/ThreadLocalTargetSource.cs index 540aa784..d1cecbc8 100644 --- a/src/Spring/Spring.Aop/Aop/Target/ThreadLocalTargetSource.cs +++ b/src/Spring/Spring.Aop/Aop/Target/ThreadLocalTargetSource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using AopAlliance.Intercept; using Microsoft.Extensions.Logging; using Spring.Aop.Support; using Spring.Collections; using Spring.Util; -#endregion - namespace Spring.Aop.Target; /// @@ -56,8 +48,6 @@ namespace Spring.Aop.Target; public sealed class ThreadLocalTargetSource : AbstractPrototypeTargetSource, IThreadLocalTargetSourceStats, IDisposable, IMethodInterceptor { - #region Fields - /// /// ThreadLocal holding the target associated with the current thread. /// @@ -78,10 +68,6 @@ public sealed class ThreadLocalTargetSource : AbstractPrototypeTargetSource, private int _invocations; private int _hits; - #endregion - - #region Properties - /// /// Gets the number of invocations of the and /// methods. @@ -120,10 +106,6 @@ public sealed class ThreadLocalTargetSource : AbstractPrototypeTargetSource, get { return Thread.GetData(_targetInThread); } } - #endregion - - #region Methods - /// /// Returns the target object. /// @@ -144,8 +126,6 @@ public sealed class ThreadLocalTargetSource : AbstractPrototypeTargetSource, object target = ThreadBoundTarget; if (target == null) { - #region Instrumentation - if (logger.IsEnabled(LogLevel.Debug)) { logger.LogDebug(string.Format( @@ -154,8 +134,6 @@ public sealed class ThreadLocalTargetSource : AbstractPrototypeTargetSource, TargetObjectName, Thread.CurrentThread.GetHashCode())); } - #endregion - target = NewPrototypeInstance(); Thread.SetData(_targetInThread, target); _targetSet.Add(target); @@ -184,15 +162,11 @@ public sealed class ThreadLocalTargetSource : AbstractPrototypeTargetSource, /// public void Dispose() { - #region Instrumentation - if (logger.IsEnabled(LogLevel.Debug)) { logger.LogDebug("Destroying ThreadLocal bindings"); } - #endregion - foreach (object target in _targetSet) { if (target is IDisposable) @@ -203,8 +177,6 @@ public sealed class ThreadLocalTargetSource : AbstractPrototypeTargetSource, } catch (Exception ex) { - #region Instrumentation - if (logger.IsEnabled(LogLevel.Warning)) { string message = string.Format( @@ -213,8 +185,6 @@ public sealed class ThreadLocalTargetSource : AbstractPrototypeTargetSource, target.GetType()); logger.LogWarning(ex, message); } - - #endregion } } } @@ -239,6 +209,4 @@ public sealed class ThreadLocalTargetSource : AbstractPrototypeTargetSource, return invocation.Method.Invoke(GetTarget(), invocation.Arguments); } - - #endregion } diff --git a/src/Spring/Spring.Aop/Aop/TrueMethodMatcher.cs b/src/Spring/Spring.Aop/Aop/TrueMethodMatcher.cs index fc857559..464a2cd1 100644 --- a/src/Spring/Spring.Aop/Aop/TrueMethodMatcher.cs +++ b/src/Spring/Spring.Aop/Aop/TrueMethodMatcher.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using System.Runtime.Serialization; using System.Security.Permissions; -#endregion - namespace Spring.Aop; /// diff --git a/src/Spring/Spring.Aop/Aop/TruePointcut.cs b/src/Spring/Spring.Aop/Aop/TruePointcut.cs index 1094d917..e688cf6e 100644 --- a/src/Spring/Spring.Aop/Aop/TruePointcut.cs +++ b/src/Spring/Spring.Aop/Aop/TruePointcut.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Runtime.Serialization; using System.Security.Permissions; -#endregion - namespace Spring.Aop; /// diff --git a/src/Spring/Spring.Aop/Aop/TrueTypeFilter.cs b/src/Spring/Spring.Aop/Aop/TrueTypeFilter.cs index 49a9a1ac..cce233a2 100644 --- a/src/Spring/Spring.Aop/Aop/TrueTypeFilter.cs +++ b/src/Spring/Spring.Aop/Aop/TrueTypeFilter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Runtime.Serialization; using System.Security.Permissions; -#endregion - namespace Spring.Aop; /// diff --git a/src/Spring/Spring.Aop/AopAlliance/Aop/AspectException.cs b/src/Spring/Spring.Aop/AopAlliance/Aop/AspectException.cs index 456b1f01..e0ca6bb0 100644 --- a/src/Spring/Spring.Aop/AopAlliance/Aop/AspectException.cs +++ b/src/Spring/Spring.Aop/AopAlliance/Aop/AspectException.cs @@ -1,5 +1,3 @@ -#region License - /* * All the source code provided by AOP Alliance is Public Domain. * @@ -7,14 +5,8 @@ * */ -#endregion - -#region Imports - using System.Runtime.Serialization; -#endregion - namespace AopAlliance.Aop; /// diff --git a/src/Spring/Spring.Aop/AopAlliance/Aop/IAdvice.cs b/src/Spring/Spring.Aop/AopAlliance/Aop/IAdvice.cs index a97cd8c0..8b036eae 100644 --- a/src/Spring/Spring.Aop/AopAlliance/Aop/IAdvice.cs +++ b/src/Spring/Spring.Aop/AopAlliance/Aop/IAdvice.cs @@ -1,5 +1,3 @@ -#region License - /* * All the source code provided by AOP Alliance is Public Domain. * @@ -7,8 +5,6 @@ * */ -#endregion - namespace AopAlliance.Aop; /// diff --git a/src/Spring/Spring.Aop/AopAlliance/Intercept/IConstructorInterceptor.cs b/src/Spring/Spring.Aop/AopAlliance/Intercept/IConstructorInterceptor.cs index cc3c462e..48437802 100644 --- a/src/Spring/Spring.Aop/AopAlliance/Intercept/IConstructorInterceptor.cs +++ b/src/Spring/Spring.Aop/AopAlliance/Intercept/IConstructorInterceptor.cs @@ -1,5 +1,3 @@ -#region License - /* * All the source code provided by AOP Alliance is Public Domain. * @@ -7,8 +5,6 @@ * */ -#endregion - namespace AopAlliance.Intercept; /// diff --git a/src/Spring/Spring.Aop/AopAlliance/Intercept/IConstructorInvocation.cs b/src/Spring/Spring.Aop/AopAlliance/Intercept/IConstructorInvocation.cs index f50fdc23..acdf093f 100644 --- a/src/Spring/Spring.Aop/AopAlliance/Intercept/IConstructorInvocation.cs +++ b/src/Spring/Spring.Aop/AopAlliance/Intercept/IConstructorInvocation.cs @@ -1,5 +1,3 @@ -#region License - /* * All the source code provided by AOP Alliance is Public Domain. * @@ -7,14 +5,8 @@ * */ -#endregion - -#region Imports - using System.Reflection; -#endregion - namespace AopAlliance.Intercept; /// diff --git a/src/Spring/Spring.Aop/AopAlliance/Intercept/IInterceptor.cs b/src/Spring/Spring.Aop/AopAlliance/Intercept/IInterceptor.cs index 3500441e..48c7cfdc 100644 --- a/src/Spring/Spring.Aop/AopAlliance/Intercept/IInterceptor.cs +++ b/src/Spring/Spring.Aop/AopAlliance/Intercept/IInterceptor.cs @@ -1,5 +1,3 @@ -#region License - /* * All the source code provided by AOP Alliance is Public Domain. * @@ -7,14 +5,8 @@ * */ -#endregion - -#region Imports - using AopAlliance.Aop; -#endregion - namespace AopAlliance.Intercept; /// diff --git a/src/Spring/Spring.Aop/AopAlliance/Intercept/IInvocation.cs b/src/Spring/Spring.Aop/AopAlliance/Intercept/IInvocation.cs index bd66c69c..b821d06e 100644 --- a/src/Spring/Spring.Aop/AopAlliance/Intercept/IInvocation.cs +++ b/src/Spring/Spring.Aop/AopAlliance/Intercept/IInvocation.cs @@ -1,5 +1,3 @@ -#region License - /* * All the source code provided by AOP Alliance is Public Domain. * @@ -7,8 +5,6 @@ * */ -#endregion - namespace AopAlliance.Intercept; /// diff --git a/src/Spring/Spring.Aop/AopAlliance/Intercept/IJoinpoint.cs b/src/Spring/Spring.Aop/AopAlliance/Intercept/IJoinpoint.cs index 67488680..5ecbe048 100644 --- a/src/Spring/Spring.Aop/AopAlliance/Intercept/IJoinpoint.cs +++ b/src/Spring/Spring.Aop/AopAlliance/Intercept/IJoinpoint.cs @@ -1,5 +1,3 @@ -#region License - /* * All the source code provided by AOP Alliance is Public Domain. * @@ -7,14 +5,8 @@ * */ -#endregion - -#region Imports - using System.Reflection; -#endregion - namespace AopAlliance.Intercept; /// diff --git a/src/Spring/Spring.Aop/AopAlliance/Intercept/IMethodInterceptor.cs b/src/Spring/Spring.Aop/AopAlliance/Intercept/IMethodInterceptor.cs index 0ecf6bed..cf8743f2 100644 --- a/src/Spring/Spring.Aop/AopAlliance/Intercept/IMethodInterceptor.cs +++ b/src/Spring/Spring.Aop/AopAlliance/Intercept/IMethodInterceptor.cs @@ -1,5 +1,3 @@ -#region License - /* * All the source code provided by AOP Alliance is Public Domain. * @@ -7,8 +5,6 @@ * */ -#endregion - namespace AopAlliance.Intercept; /// diff --git a/src/Spring/Spring.Aop/AopAlliance/Intercept/IMethodInvocation.cs b/src/Spring/Spring.Aop/AopAlliance/Intercept/IMethodInvocation.cs index 1d37141b..8f10f4bc 100644 --- a/src/Spring/Spring.Aop/AopAlliance/Intercept/IMethodInvocation.cs +++ b/src/Spring/Spring.Aop/AopAlliance/Intercept/IMethodInvocation.cs @@ -1,5 +1,3 @@ -#region License - /* * All the source code provided by AOP Alliance is Public Domain. * @@ -7,14 +5,8 @@ * */ -#endregion - -#region Imports - using System.Reflection; -#endregion - namespace AopAlliance.Intercept; /// diff --git a/src/Spring/Spring.Aop/Aspects/AbstractExceptionHandler.cs b/src/Spring/Spring.Aop/Aspects/AbstractExceptionHandler.cs index f4eb40c9..db5cfadd 100644 --- a/src/Spring/Spring.Aop/Aspects/AbstractExceptionHandler.cs +++ b/src/Spring/Spring.Aop/Aspects/AbstractExceptionHandler.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Microsoft.Extensions.Logging; using Spring.Expressions; @@ -30,8 +26,6 @@ namespace Spring.Aspects; /// Mark Pollack public abstract class AbstractExceptionHandler : IExceptionHandler { - #region Fields - /// /// The logging instance /// @@ -43,10 +37,6 @@ public abstract class AbstractExceptionHandler : IExceptionHandler private bool continueProcessing = false; private string constraintExpressionText; - #endregion - - #region Constructor(s) - /// /// Initializes a new instance of the class. /// @@ -68,12 +58,6 @@ public abstract class AbstractExceptionHandler : IExceptionHandler } } - #endregion - - #region Implementation of IExceptionHandler - - #region Properties - /// /// Gets the source exception names. /// @@ -124,8 +108,6 @@ public abstract class AbstractExceptionHandler : IExceptionHandler set { continueProcessing = value; } } - #endregion - /// /// Determines whether this instance can handle the exception the specified exception. /// @@ -179,6 +161,4 @@ public abstract class AbstractExceptionHandler : IExceptionHandler /// /// The return value from handling the exception, if not rethrown or a new exception is thrown. public abstract object HandleException(IDictionary callContextDictionary); - - #endregion } diff --git a/src/Spring/Spring.Aop/Aspects/AbstractExceptionHandlerAdvice.cs b/src/Spring/Spring.Aop/Aspects/AbstractExceptionHandlerAdvice.cs index 06bca435..cd234682 100644 --- a/src/Spring/Spring.Aop/Aspects/AbstractExceptionHandlerAdvice.cs +++ b/src/Spring/Spring.Aop/Aspects/AbstractExceptionHandlerAdvice.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using System.Text.RegularExpressions; using AopAlliance.Intercept; @@ -157,8 +153,6 @@ public abstract class AbstractExceptionHandlerAdvice : IMethodInterceptor, IInit return reg.Match(adviceExpressionString); } - #region Serialization - void IDeserializationCallback.OnDeserialization(object sender) { OnDeserialization(sender); @@ -170,6 +164,4 @@ public abstract class AbstractExceptionHandlerAdvice : IMethodInterceptor, IInit protected virtual void OnDeserialization(object sender) { } - - #endregion } diff --git a/src/Spring/Spring.Aop/Aspects/Cache/BaseCacheAdvice.cs b/src/Spring/Spring.Aop/Aspects/Cache/BaseCacheAdvice.cs index f984955f..51d7a2e8 100644 --- a/src/Spring/Spring.Aop/Aspects/Cache/BaseCacheAdvice.cs +++ b/src/Spring/Spring.Aop/Aspects/Cache/BaseCacheAdvice.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using Microsoft.Extensions.Logging; using Spring.Caching; using Spring.Context; using Spring.Expressions; -#endregion - namespace Spring.Aspects.Cache; /// diff --git a/src/Spring/Spring.Aop/Aspects/Cache/CacheAspect.cs b/src/Spring/Spring.Aop/Aspects/Cache/CacheAspect.cs index 1deebb8e..d55cf7d9 100644 --- a/src/Spring/Spring.Aop/Aspects/Cache/CacheAspect.cs +++ b/src/Spring/Spring.Aop/Aspects/Cache/CacheAspect.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Aop; using Spring.Context; -#endregion - namespace Spring.Aspects.Cache; /// diff --git a/src/Spring/Spring.Aop/Aspects/Cache/CacheParameterAdvice.cs b/src/Spring/Spring.Aop/Aspects/Cache/CacheParameterAdvice.cs index d697330d..cd39f918 100644 --- a/src/Spring/Spring.Aop/Aspects/Cache/CacheParameterAdvice.cs +++ b/src/Spring/Spring.Aop/Aspects/Cache/CacheParameterAdvice.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Reflection; using Microsoft.Extensions.Logging; @@ -27,8 +21,6 @@ using Spring.Aop; using Spring.Caching; using Spring.Util; -#endregion - namespace Spring.Aspects.Cache; /// @@ -53,8 +45,6 @@ namespace Spring.Aspects.Cache; /// Aleksandar Seovic public class CacheParameterAdvice : BaseCacheAdvice, IAfterReturningAdvice { - #region CacheParameterAttribute caching - private class CacheParameterInfo { public readonly ParameterInfo[] Parameters; @@ -90,8 +80,6 @@ public class CacheParameterAdvice : BaseCacheAdvice, IAfterReturningAdvice return cpi; } - #endregion - /// /// Executes after target /// returns successfully. @@ -115,12 +103,8 @@ public class CacheParameterAdvice : BaseCacheAdvice, IAfterReturningAdvice /// public void AfterReturning(object returnValue, MethodInfo method, object[] arguments, object target) { - #region Instrumentation - bool isLogDebugEnabled = logger.IsEnabled(LogLevel.Debug); - #endregion - CacheParameterInfo cpi = GetCacheParameterInfo(method); CacheParameterAttribute[][] cacheParameterAttributes = cpi.CacheParameterAttributes; @@ -140,15 +124,11 @@ public class CacheParameterAdvice : BaseCacheAdvice, IAfterReturningAdvice object key = paramInfo.KeyExpression.GetValue(arguments[i], vars); - #region Instrumentation - if (isLogDebugEnabled) { logger.LogDebug(string.Format("Caching parameter for key [{0}] into cache [{1}].", key, paramInfo.CacheName)); } - #endregion - cache.Insert(key, arguments[i], paramInfo.TimeToLiveTimeSpan); } } diff --git a/src/Spring/Spring.Aop/Aspects/Cache/CacheParameterAdvisor.cs b/src/Spring/Spring.Aop/Aspects/Cache/CacheParameterAdvisor.cs index b358fd2e..a5ba4713 100644 --- a/src/Spring/Spring.Aop/Aspects/Cache/CacheParameterAdvisor.cs +++ b/src/Spring/Spring.Aop/Aspects/Cache/CacheParameterAdvisor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using Spring.Aop.Support; using Spring.Caching; using Spring.Context; -#endregion - namespace Spring.Aspects.Cache; /// diff --git a/src/Spring/Spring.Aop/Aspects/Cache/CacheResultAdvice.cs b/src/Spring/Spring.Aop/Aspects/Cache/CacheResultAdvice.cs index 91ef534c..02590372 100644 --- a/src/Spring/Spring.Aop/Aspects/Cache/CacheResultAdvice.cs +++ b/src/Spring/Spring.Aop/Aspects/Cache/CacheResultAdvice.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Reflection; using AopAlliance.Intercept; @@ -28,8 +22,6 @@ using Spring.Util; using System.Collections.Concurrent; using Microsoft.Extensions.Logging; -#endregion - namespace Spring.Aspects.Cache; /// @@ -50,8 +42,6 @@ namespace Spring.Aspects.Cache; /// Aleksandar Seovic public class CacheResultAdvice : BaseCacheAdvice, IMethodInterceptor { - #region CacheResultAttribute & CacheResultItemsAttribute caching - private class CacheResultInfo { public readonly CacheResultAttribute ResultInfo; @@ -79,8 +69,6 @@ public class CacheResultAdvice : BaseCacheAdvice, IMethodInterceptor return cacheResultInfo; } - #endregion - /// /// Inner class to help cache null values. /// @@ -173,12 +161,8 @@ public class CacheResultAdvice : BaseCacheAdvice, IMethodInterceptor { if (resultInfo != null) { - #region Instrumentation - bool isLogDebugEnabled = logger.IsEnabled(LogLevel.Debug); - #endregion - AssertUtils.ArgumentNotNull(resultInfo.KeyExpression, "Key", "The cache attribute is missing the key definition."); @@ -197,55 +181,39 @@ public class CacheResultAdvice : BaseCacheAdvice, IMethodInterceptor Type returnType = invocation.Method.ReturnType; if (returnValue != null && !returnType.IsInstanceOfType(returnValue)) { - #region Instrumentation - if (isLogDebugEnabled) { logger.LogDebug(String.Format("Object for key [{0}] was of type [{1}] which is not compatible with return type [{2}]. Proceeding...", resultKey, returnValue.GetType(), returnType)); } - #endregion - cacheHit = false; returnValue = null; } if (!cacheHit) { - #region Instrumentation - if (isLogDebugEnabled) { logger.LogDebug(String.Format("Object for key [{0}] was not found in cache [{1}]. Proceeding...", resultKey, resultInfo.CacheName)); } - #endregion - returnValue = invocation.Proceed(); if (EvalCondition(resultInfo.Condition, resultInfo.ConditionExpression, returnValue, vars)) { - #region Instrumentation - if (isLogDebugEnabled) { logger.LogDebug(String.Format("Caching object for key [{0}] into cache [{1}].", resultKey, resultInfo.CacheName)); } - #endregion - cache.Insert(resultKey, (returnValue == null) ? NullValue : returnValue, resultInfo.TimeToLiveTimeSpan); } } else { - #region Instrumentation - if (isLogDebugEnabled) { logger.LogDebug(String.Format("Object for key [{0}] found in cache [{1}]. Aborting invocation...", resultKey, resultInfo.CacheName)); } - - #endregion } return returnValue; @@ -276,27 +244,19 @@ public class CacheResultAdvice : BaseCacheAdvice, IMethodInterceptor ICache cache = GetCache(itemInfo.CacheName); - #region Instrumentation - bool isDebugEnabled = logger.IsEnabled(LogLevel.Debug); - #endregion - foreach (object item in items) { if (EvalCondition(itemInfo.Condition, itemInfo.ConditionExpression, item, vars)) { object itemKey = itemInfo.KeyExpression.GetValue(item, vars); - #region Instrumentation - if (isDebugEnabled) { logger.LogDebug("Caching collection item for key [" + itemKey + "]."); } - #endregion - cache.Insert(itemKey, (item == null ? NullValue : item), itemInfo.TimeToLiveTimeSpan); } } diff --git a/src/Spring/Spring.Aop/Aspects/Cache/CacheResultAdvisor.cs b/src/Spring/Spring.Aop/Aspects/Cache/CacheResultAdvisor.cs index 274fcd7a..6262771f 100644 --- a/src/Spring/Spring.Aop/Aspects/Cache/CacheResultAdvisor.cs +++ b/src/Spring/Spring.Aop/Aspects/Cache/CacheResultAdvisor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Aop.Support; using Spring.Caching; using Spring.Context; -#endregion - namespace Spring.Aspects.Cache; /// diff --git a/src/Spring/Spring.Aop/Aspects/Cache/InvalidateCacheAdvice.cs b/src/Spring/Spring.Aop/Aspects/Cache/InvalidateCacheAdvice.cs index 219b066c..cd4032dd 100644 --- a/src/Spring/Spring.Aop/Aspects/Cache/InvalidateCacheAdvice.cs +++ b/src/Spring/Spring.Aop/Aspects/Cache/InvalidateCacheAdvice.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Reflection; using Microsoft.Extensions.Logging; using Spring.Aop; using Spring.Caching; -#endregion - namespace Spring.Aspects.Cache; /// @@ -54,8 +46,6 @@ namespace Spring.Aspects.Cache; /// Aleksandar Seovic public class InvalidateCacheAdvice : BaseCacheAdvice, IAfterReturningAdvice { - #region InvalidateCacheAttribute caching - private readonly Hashtable _invalidateCacheAttributeCache = new Hashtable(); private InvalidateCacheAttribute[] GetInvalidateCacheInfo(MethodInfo method) @@ -70,8 +60,6 @@ public class InvalidateCacheAdvice : BaseCacheAdvice, IAfterReturningAdvice return cacheInfoArray; } - #endregion - /// /// Executes after /// returns successfully. @@ -95,12 +83,8 @@ public class InvalidateCacheAdvice : BaseCacheAdvice, IAfterReturningAdvice /// public void AfterReturning(object returnValue, MethodInfo method, object[] arguments, object target) { - #region Instrumentation - bool isLogDebugEnabled = logger.IsEnabled(LogLevel.Debug); - #endregion - InvalidateCacheAttribute[] cacheInfoArray = GetInvalidateCacheInfo(method); if (cacheInfoArray.Length > 0) @@ -117,42 +101,30 @@ public class InvalidateCacheAdvice : BaseCacheAdvice, IAfterReturningAdvice object keys = cacheInfo.KeysExpression.GetValue(returnValue, vars); if (keys is ICollection) { - #region Instrumentation - if (isLogDebugEnabled) { logger.LogDebug(string.Format("Removing objects for keys [{0}] from cache [{1}].", keys, cacheInfo.CacheName)); } - #endregion - cache.RemoveAll((ICollection) keys); } else { - #region Instrumentation - if (isLogDebugEnabled) { logger.LogDebug(string.Format("Removing object for key [{0}] from cache [{1}].", keys, cacheInfo.CacheName)); } - #endregion - cache.Remove(keys); } } else { - #region Instrumentation - if (isLogDebugEnabled) { logger.LogDebug(string.Format("Invalidate cache [{0}].", cacheInfo.CacheName)); } - #endregion - cache.Clear(); } } diff --git a/src/Spring/Spring.Aop/Aspects/Cache/InvalidateCacheAdvisor.cs b/src/Spring/Spring.Aop/Aspects/Cache/InvalidateCacheAdvisor.cs index fec55915..def4d7bb 100644 --- a/src/Spring/Spring.Aop/Aspects/Cache/InvalidateCacheAdvisor.cs +++ b/src/Spring/Spring.Aop/Aspects/Cache/InvalidateCacheAdvisor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Aop.Support; using Spring.Caching; using Spring.Context; -#endregion - namespace Spring.Aspects.Cache; /// diff --git a/src/Spring/Spring.Aop/Aspects/Exceptions/ExceptionHandlerAdvice.cs b/src/Spring/Spring.Aop/Aspects/Exceptions/ExceptionHandlerAdvice.cs index 2e1f5cf5..5744df3a 100644 --- a/src/Spring/Spring.Aop/Aspects/Exceptions/ExceptionHandlerAdvice.cs +++ b/src/Spring/Spring.Aop/Aspects/Exceptions/ExceptionHandlerAdvice.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Reflection; using AopAlliance.Intercept; @@ -68,8 +64,6 @@ namespace Spring.Aspects.Exceptions; [Serializable] public class ExceptionHandlerAdvice : AbstractExceptionHandlerAdvice { - #region Fields - /// /// Log instance available to subclasses /// @@ -86,10 +80,6 @@ public class ExceptionHandlerAdvice : AbstractExceptionHandlerAdvice private string onExceptionRegex = @"^(on\s+exception\s+)(\(.*?\))\s+(log|translate|wrap|replace|return|swallow|execute)\s*(.*?)$"; - #endregion - - #region Properties - /// /// Gets or sets the Regex string used to parse advice expressions starting with 'on exception name' and exception handling actions. /// @@ -132,10 +122,6 @@ public class ExceptionHandlerAdvice : AbstractExceptionHandlerAdvice get { return exceptionHandlerTable; } } - #endregion - - #region IMethodInterceptor implementation - /// /// Implement this method to perform extra treatments before and after /// the call to the supplied . @@ -209,10 +195,6 @@ public class ExceptionHandlerAdvice : AbstractExceptionHandlerAdvice } } - #endregion - - #region IInitializingObject implementation - /// /// Invoked by an /// after it has injected all of an object's dependencies. @@ -274,10 +256,6 @@ public class ExceptionHandlerAdvice : AbstractExceptionHandlerAdvice exceptionHandlers = newExceptionHandlers; } - #endregion - - #region Methods - /// /// Invokes handlers registered for the passed exception and /// @@ -569,10 +547,6 @@ public class ExceptionHandlerAdvice : AbstractExceptionHandlerAdvice } } - #endregion - - #region ExceptionHandlerTable class - /// /// A specialized dictionary for key value pairs of (string, IExceptionHandler) /// @@ -635,6 +609,4 @@ public class ExceptionHandlerAdvice : AbstractExceptionHandlerAdvice } } } - - #endregion } diff --git a/src/Spring/Spring.Aop/Aspects/Exceptions/LogExceptionHandler.cs b/src/Spring/Spring.Aop/Aspects/Exceptions/LogExceptionHandler.cs index f987f419..0592f8fe 100644 --- a/src/Spring/Spring.Aop/Aspects/Exceptions/LogExceptionHandler.cs +++ b/src/Spring/Spring.Aop/Aspects/Exceptions/LogExceptionHandler.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using Spring.Expressions; @@ -29,8 +25,6 @@ namespace Spring.Aspects.Exceptions; /// Mark Pollack public class LogExceptionHandler : AbstractExceptionHandler { - #region Fields - private string logName = "LogExceptionHandler"; private LogLevel logLevel = LogLevel.Trace; @@ -41,8 +35,6 @@ public class LogExceptionHandler : AbstractExceptionHandler private string actionExpressionText; - #endregion - /// /// Initializes a new instance of the class. /// diff --git a/src/Spring/Spring.Aop/Aspects/Exceptions/ReturnValueExceptionHandler.cs b/src/Spring/Spring.Aop/Aspects/Exceptions/ReturnValueExceptionHandler.cs index c75d93e6..6c3653f8 100644 --- a/src/Spring/Spring.Aop/Aspects/Exceptions/ReturnValueExceptionHandler.cs +++ b/src/Spring/Spring.Aop/Aspects/Exceptions/ReturnValueExceptionHandler.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using Spring.Expressions; diff --git a/src/Spring/Spring.Aop/Aspects/Exceptions/SwallowExceptionHandler.cs b/src/Spring/Spring.Aop/Aspects/Exceptions/SwallowExceptionHandler.cs index f627ec70..c45fdf98 100644 --- a/src/Spring/Spring.Aop/Aspects/Exceptions/SwallowExceptionHandler.cs +++ b/src/Spring/Spring.Aop/Aspects/Exceptions/SwallowExceptionHandler.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Aspects.Exceptions; /// diff --git a/src/Spring/Spring.Aop/Aspects/Exceptions/TranslationExceptionHandler.cs b/src/Spring/Spring.Aop/Aspects/Exceptions/TranslationExceptionHandler.cs index 41c1f09b..4d4f77cd 100644 --- a/src/Spring/Spring.Aop/Aspects/Exceptions/TranslationExceptionHandler.cs +++ b/src/Spring/Spring.Aop/Aspects/Exceptions/TranslationExceptionHandler.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using Spring.Expressions; diff --git a/src/Spring/Spring.Aop/Aspects/IExceptionHandler.cs b/src/Spring/Spring.Aop/Aspects/IExceptionHandler.cs index d7047c5a..fab5021d 100644 --- a/src/Spring/Spring.Aop/Aspects/IExceptionHandler.cs +++ b/src/Spring/Spring.Aop/Aspects/IExceptionHandler.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; namespace Spring.Aspects; diff --git a/src/Spring/Spring.Aop/Aspects/Logging/AbstractLoggingAdvice.cs b/src/Spring/Spring.Aop/Aspects/Logging/AbstractLoggingAdvice.cs index fa6b568b..3c14126b 100644 --- a/src/Spring/Spring.Aop/Aspects/Logging/AbstractLoggingAdvice.cs +++ b/src/Spring/Spring.Aop/Aspects/Logging/AbstractLoggingAdvice.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using System.Runtime.Serialization; using AopAlliance.Intercept; @@ -36,8 +32,6 @@ namespace Spring.Aspects.Logging; [Serializable] public abstract class AbstractLoggingAdvice : IMethodInterceptor, IDeserializationCallback { - #region Fields - /// /// The default ILog instance used to write logging messages. /// @@ -53,10 +47,6 @@ public abstract class AbstractLoggingAdvice : IMethodInterceptor, IDeserializati /// private bool hideProxyTypeNames = false; - #endregion - - #region Constructor - /// /// Creates a new advice instance using this advice type's name for logging by default. /// @@ -73,10 +63,6 @@ public abstract class AbstractLoggingAdvice : IMethodInterceptor, IDeserializati this.defaultLogger = defaultLogger; } - #endregion - - #region Properties - /// /// Sets a value indicating whether to use a dynamic logger or static logger /// @@ -132,10 +118,6 @@ public abstract class AbstractLoggingAdvice : IMethodInterceptor, IDeserializati set { hideProxyTypeNames = value; } } - #endregion - - #region Methods - /// /// Adds logging to the method invocation. /// @@ -258,8 +240,6 @@ public abstract class AbstractLoggingAdvice : IMethodInterceptor, IDeserializati } } - #endregion - /// /// Sets the default logger to the given name. /// diff --git a/src/Spring/Spring.Aop/Aspects/Logging/SimpleLoggingAdvice.cs b/src/Spring/Spring.Aop/Aspects/Logging/SimpleLoggingAdvice.cs index 11bf5dd4..25e2df22 100644 --- a/src/Spring/Spring.Aop/Aspects/Logging/SimpleLoggingAdvice.cs +++ b/src/Spring/Spring.Aop/Aspects/Logging/SimpleLoggingAdvice.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using System.Text; using AopAlliance.Intercept; @@ -35,8 +31,6 @@ namespace Spring.Aspects.Logging; [Serializable] public class SimpleLoggingAdvice : AbstractLoggingAdvice { - #region Fields - /// /// Flag to indicate if unique identifier should be in the log message. /// @@ -67,10 +61,6 @@ public class SimpleLoggingAdvice : AbstractLoggingAdvice /// private LogLevel logLevel = LogLevel.Trace; - #endregion - - #region Constructor(s) - /// /// Initializes a new instance of the class. /// @@ -97,10 +87,6 @@ public class SimpleLoggingAdvice : AbstractLoggingAdvice { } - #endregion - - #region Properties - /// /// Gets or sets a value indicating whether to log a unique identifier with the log message. /// @@ -161,10 +147,6 @@ public class SimpleLoggingAdvice : AbstractLoggingAdvice set { logLevel = value; } } - #endregion - - #region Protected Methods - /// /// Subclasses must override this method to perform any tracing around the supplied /// IMethodInvocation. @@ -406,10 +388,6 @@ public class SimpleLoggingAdvice : AbstractLoggingAdvice return RemoveLastSeparator(sb.ToString(), "; "); } - #endregion - - #region Private Methods - private string RemoveLastSeparator(string str, string separator) { if (str.EndsWith(separator)) @@ -479,6 +457,4 @@ public class SimpleLoggingAdvice : AbstractLoggingAdvice break; } } - - #endregion } \ No newline at end of file diff --git a/src/Spring/Spring.Aop/Aspects/ParsedAdviceExpression.cs b/src/Spring/Spring.Aop/Aspects/ParsedAdviceExpression.cs index 11c1a321..4c7808a1 100644 --- a/src/Spring/Spring.Aop/Aspects/ParsedAdviceExpression.cs +++ b/src/Spring/Spring.Aop/Aspects/ParsedAdviceExpression.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Aspects; /// diff --git a/src/Spring/Spring.Aop/Aspects/RetryAdvice.cs b/src/Spring/Spring.Aop/Aspects/RetryAdvice.cs index 1a1cfc54..2727af65 100644 --- a/src/Spring/Spring.Aop/Aspects/RetryAdvice.cs +++ b/src/Spring/Spring.Aop/Aspects/RetryAdvice.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Text.RegularExpressions; using AopAlliance.Intercept; using Microsoft.Extensions.Logging; @@ -52,8 +48,6 @@ public class RetryAdvice : AbstractExceptionHandlerAdvice timeSpanConverter = new TimeSpanConverter(); } - #region Fields - private SleepHandler sleepHandler; [NonSerialized] private RetryExceptionHandler retryExceptionHandler; @@ -70,10 +64,6 @@ public class RetryAdvice : AbstractExceptionHandlerAdvice //retry 3x rate 10n+5 private string rateRegex = @"^(\d+)x\s+(rate)\s+(\(.*?\))?$"; - #endregion - - #region Properties - /// /// Gets or sets the retry expression. /// @@ -104,8 +94,6 @@ public class RetryAdvice : AbstractExceptionHandlerAdvice set { onExceptionRegex = value; } } - #endregion - /// /// Creates a new RetryAdvice instance, using for delaying retries /// @@ -122,8 +110,6 @@ public class RetryAdvice : AbstractExceptionHandlerAdvice this.sleepHandler = sleepHandler; } - #region IMethodInterceptor implementation - /// /// Implement this method to perform extra treatments before and after /// the call to the supplied . @@ -225,10 +211,6 @@ public class RetryAdvice : AbstractExceptionHandlerAdvice } } - #endregion - - #region IInitializingObject implementation - /// /// Invoked by an /// after it has injected all of an object's dependencies. @@ -271,8 +253,6 @@ public class RetryAdvice : AbstractExceptionHandlerAdvice retryExceptionHandler = handler; } - #endregion - /// /// Parses the specified handler string. /// diff --git a/src/Spring/Spring.Aop/Aspects/RetryExceptionHandler.cs b/src/Spring/Spring.Aop/Aspects/RetryExceptionHandler.cs index 3814aba9..9355bfc6 100644 --- a/src/Spring/Spring.Aop/Aspects/RetryExceptionHandler.cs +++ b/src/Spring/Spring.Aop/Aspects/RetryExceptionHandler.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Aspects; /// @@ -29,8 +25,6 @@ namespace Spring.Aspects; /// Mark Pollack public class RetryExceptionHandler : AbstractExceptionHandler { - #region Fields - private int maximumRetryCount; private bool isDelayBased; @@ -38,10 +32,6 @@ public class RetryExceptionHandler : AbstractExceptionHandler private TimeSpan delayTimeSpan; private string delayRateExpression; - #endregion - - #region Constructor - /// /// Initializes a new instance of the class. /// @@ -57,10 +47,6 @@ public class RetryExceptionHandler : AbstractExceptionHandler { } - #endregion - - #region Properties - /// /// Gets the maximum retry count. /// @@ -104,10 +90,6 @@ public class RetryExceptionHandler : AbstractExceptionHandler set { delayRateExpression = value; } } - #endregion - - #region Methods - /// /// Handles the exception. /// @@ -119,6 +101,4 @@ public class RetryExceptionHandler : AbstractExceptionHandler { return null; } - - #endregion } diff --git a/src/Spring/Spring.Aop/Aspects/Validation/ParameterValidationAdvisor.cs b/src/Spring/Spring.Aop/Aspects/Validation/ParameterValidationAdvisor.cs index 647b71b8..f0870a9a 100644 --- a/src/Spring/Spring.Aop/Aspects/Validation/ParameterValidationAdvisor.cs +++ b/src/Spring/Spring.Aop/Aspects/Validation/ParameterValidationAdvisor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using Spring.Aop.Support; using Spring.Validation; using Spring.Context; -#endregion - namespace Spring.Aspects.Validation; /// diff --git a/src/Spring/Spring.Core/AssemblyInfo.cs b/src/Spring/Spring.Core/AssemblyInfo.cs index 5fff897e..20f449a3 100644 --- a/src/Spring/Spring.Core/AssemblyInfo.cs +++ b/src/Spring/Spring.Core/AssemblyInfo.cs @@ -1,7 +1,5 @@ -#region License - /* - * Copyright © 2002-2011 the original author or authors. + * Copyright � 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using System.Runtime.InteropServices; diff --git a/src/Spring/Spring.Core/Caching/AbstractCache.cs b/src/Spring/Spring.Core/Caching/AbstractCache.cs index 71eb4e3e..ff8dc4b1 100644 --- a/src/Spring/Spring.Core/Caching/AbstractCache.cs +++ b/src/Spring/Spring.Core/Caching/AbstractCache.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; namespace Spring.Caching; @@ -30,15 +26,9 @@ namespace Spring.Caching; /// Erich Eichinger public abstract class AbstractCache : ICache { - #region Fields - private bool _enforceTimeToLive = false; private TimeSpan _timeToLive = TimeSpan.Zero; - #endregion - - #region Properties - /// /// Gets/Set the Default time-to-live (TTL) for items inserted into this cache. /// Used by @@ -60,12 +50,6 @@ public abstract class AbstractCache : ICache set { _enforceTimeToLive = value; } } - #endregion - - #region ICache Implementation - - #region - /// /// Gets the number of items in the cache. /// @@ -170,12 +154,6 @@ public abstract class AbstractCache : ICache DoInsert(key, value, timeToLive); } - #endregion - - #endregion - - #region Methods - /// /// Actually does the cache implementation specific insert operation into the cache. /// @@ -192,6 +170,4 @@ public abstract class AbstractCache : ICache /// Item's time-to-live (TTL). /// protected abstract void DoInsert(object key, object value, TimeSpan timeToLive); - - #endregion } diff --git a/src/Spring/Spring.Core/Caching/BaseCacheAttribute.cs b/src/Spring/Spring.Core/Caching/BaseCacheAttribute.cs index 581f9e40..027e1860 100644 --- a/src/Spring/Spring.Core/Caching/BaseCacheAttribute.cs +++ b/src/Spring/Spring.Core/Caching/BaseCacheAttribute.cs @@ -10,8 +10,6 @@ namespace Spring.Caching; [Serializable] public abstract class BaseCacheAttribute : Attribute { - #region Fields - /// /// The instance used to parse values. /// @@ -27,10 +25,6 @@ public abstract class BaseCacheAttribute : Attribute private string timeToLive = null; private TimeSpan timeToLiveTimeSpan = TimeSpan.MinValue; - #endregion - - #region Constructors - /// /// Creates an attribute instance. /// @@ -65,10 +59,6 @@ public abstract class BaseCacheAttribute : Attribute this.Key = key; } - #endregion - - #region Properties - /// /// Gets or sets the name of the cache to use. /// @@ -178,6 +168,4 @@ public abstract class BaseCacheAttribute : Attribute { get { return timeToLiveTimeSpan; } } - - #endregion } diff --git a/src/Spring/Spring.Core/Caching/CacheParameterAttribute.cs b/src/Spring/Spring.Core/Caching/CacheParameterAttribute.cs index 9538c66b..97d941e4 100644 --- a/src/Spring/Spring.Core/Caching/CacheParameterAttribute.cs +++ b/src/Spring/Spring.Core/Caching/CacheParameterAttribute.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Caching; /// diff --git a/src/Spring/Spring.Core/Caching/CacheResultAttribute.cs b/src/Spring/Spring.Core/Caching/CacheResultAttribute.cs index 8c1a8569..14d0c8b4 100644 --- a/src/Spring/Spring.Core/Caching/CacheResultAttribute.cs +++ b/src/Spring/Spring.Core/Caching/CacheResultAttribute.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Caching; /// diff --git a/src/Spring/Spring.Core/Caching/CacheResultItemsAttribute.cs b/src/Spring/Spring.Core/Caching/CacheResultItemsAttribute.cs index e33817f7..49ed8b39 100644 --- a/src/Spring/Spring.Core/Caching/CacheResultItemsAttribute.cs +++ b/src/Spring/Spring.Core/Caching/CacheResultItemsAttribute.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; namespace Spring.Caching; diff --git a/src/Spring/Spring.Core/Caching/ICache.cs b/src/Spring/Spring.Core/Caching/ICache.cs index 10750b2a..6e2a35c9 100644 --- a/src/Spring/Spring.Core/Caching/ICache.cs +++ b/src/Spring/Spring.Core/Caching/ICache.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; namespace Spring.Caching; diff --git a/src/Spring/Spring.Core/Caching/InvalidateCacheAttribute.cs b/src/Spring/Spring.Core/Caching/InvalidateCacheAttribute.cs index b5f4301f..9fab56dc 100644 --- a/src/Spring/Spring.Core/Caching/InvalidateCacheAttribute.cs +++ b/src/Spring/Spring.Core/Caching/InvalidateCacheAttribute.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Expressions; namespace Spring.Caching; diff --git a/src/Spring/Spring.Core/Caching/NonExpiringCache.cs b/src/Spring/Spring.Core/Caching/NonExpiringCache.cs index a9e23385..1bb1d858 100644 --- a/src/Spring/Spring.Core/Caching/NonExpiringCache.cs +++ b/src/Spring/Spring.Core/Caching/NonExpiringCache.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; namespace Spring.Caching; diff --git a/src/Spring/Spring.Core/Collections/AbstractQueue.cs b/src/Spring/Spring.Core/Collections/AbstractQueue.cs index 04fd6ec0..0ff3107e 100644 --- a/src/Spring/Spring.Core/Collections/AbstractQueue.cs +++ b/src/Spring/Spring.Core/Collections/AbstractQueue.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; namespace Spring.Collections; diff --git a/src/Spring/Spring.Core/Collections/Generic/AbstractDictionary.cs b/src/Spring/Spring.Core/Collections/Generic/AbstractDictionary.cs index 496054c0..e5322d80 100644 --- a/src/Spring/Spring.Core/Collections/Generic/AbstractDictionary.cs +++ b/src/Spring/Spring.Core/Collections/Generic/AbstractDictionary.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2015-2015 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Collections.Generic; /// diff --git a/src/Spring/Spring.Core/Collections/Generic/ISet.cs b/src/Spring/Spring.Core/Collections/Generic/ISet.cs index 8ca725af..079552cd 100644 --- a/src/Spring/Spring.Core/Collections/Generic/ISet.cs +++ b/src/Spring/Spring.Core/Collections/Generic/ISet.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; namespace Spring.Collections.Generic; diff --git a/src/Spring/Spring.Core/Collections/Generic/LinkedHashDictionary.cs b/src/Spring/Spring.Core/Collections/Generic/LinkedHashDictionary.cs index 3bc09fdd..55c914c4 100644 --- a/src/Spring/Spring.Core/Collections/Generic/LinkedHashDictionary.cs +++ b/src/Spring/Spring.Core/Collections/Generic/LinkedHashDictionary.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2015-2015 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Collections.Generic; /// diff --git a/src/Spring/Spring.Core/Collections/Generic/OrderedSet.cs b/src/Spring/Spring.Core/Collections/Generic/OrderedSet.cs index 9080bf00..c94afd84 100644 --- a/src/Spring/Spring.Core/Collections/Generic/OrderedSet.cs +++ b/src/Spring/Spring.Core/Collections/Generic/OrderedSet.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Collections.Generic; /// diff --git a/src/Spring/Spring.Core/Collections/Generic/ReadOnlyDictionary.cs b/src/Spring/Spring.Core/Collections/Generic/ReadOnlyDictionary.cs index edcd7098..c7f3bfe9 100644 --- a/src/Spring/Spring.Core/Collections/Generic/ReadOnlyDictionary.cs +++ b/src/Spring/Spring.Core/Collections/Generic/ReadOnlyDictionary.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Collections.ObjectModel; using System.Runtime.Serialization; diff --git a/src/Spring/Spring.Core/Collections/Generic/Set.cs b/src/Spring/Spring.Core/Collections/Generic/Set.cs index 4bd2742e..53f8000c 100644 --- a/src/Spring/Spring.Core/Collections/Generic/Set.cs +++ b/src/Spring/Spring.Core/Collections/Generic/Set.cs @@ -393,8 +393,6 @@ public abstract class Set : ISet, ICollection, IEnumerable, this.Add(item); } - #region Protected helpers - /// /// Performs CopyTo when called trhough non-generic ISet (ICollection) interface /// @@ -462,10 +460,6 @@ public abstract class Set : ISet, ICollection, IEnumerable, return resultSet; } - #endregion Protected helpers - - #region ISet implementation - void ICollection.CopyTo(Array array, int index) { this.NonGenericCopyTo(array, index); @@ -557,6 +551,4 @@ public abstract class Set : ISet, ICollection, IEnumerable, return this.RetainAll(col); } - - #endregion ISet implementation } diff --git a/src/Spring/Spring.Core/Collections/HashedSet.cs b/src/Spring/Spring.Core/Collections/HashedSet.cs index 66435aa1..eb4af3c5 100644 --- a/src/Spring/Spring.Core/Collections/HashedSet.cs +++ b/src/Spring/Spring.Core/Collections/HashedSet.cs @@ -1,7 +1,5 @@ /* Copyright � 2002-2011 by Aidant Systems, Inc., and by Jason Smith. */ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -18,8 +16,6 @@ * limitations under the License. */ -#endregion - using System.Collections; namespace Spring.Collections; diff --git a/src/Spring/Spring.Core/Collections/HybridSet.cs b/src/Spring/Spring.Core/Collections/HybridSet.cs index 76efa404..af3b950a 100644 --- a/src/Spring/Spring.Core/Collections/HybridSet.cs +++ b/src/Spring/Spring.Core/Collections/HybridSet.cs @@ -1,7 +1,5 @@ /* Copyright � 2002-2011 by Aidant Systems, Inc., and by Jason Smith. */ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -18,8 +16,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Collections.Specialized; diff --git a/src/Spring/Spring.Core/Collections/IQueue.cs b/src/Spring/Spring.Core/Collections/IQueue.cs index a96feccb..2a366dbe 100644 --- a/src/Spring/Spring.Core/Collections/IQueue.cs +++ b/src/Spring/Spring.Core/Collections/IQueue.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; namespace Spring.Collections; diff --git a/src/Spring/Spring.Core/Collections/ISet.cs b/src/Spring/Spring.Core/Collections/ISet.cs index cacc6c7f..cfac4477 100644 --- a/src/Spring/Spring.Core/Collections/ISet.cs +++ b/src/Spring/Spring.Core/Collections/ISet.cs @@ -1,7 +1,5 @@ /* Copyright � 2002-2011 by Aidant Systems, Inc., and by Jason Smith. */ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -18,8 +16,6 @@ * limitations under the License. */ -#endregion - using System.Collections; namespace Spring.Collections; diff --git a/src/Spring/Spring.Core/Collections/ImmutableSet.cs b/src/Spring/Spring.Core/Collections/ImmutableSet.cs index 1b6a9c7e..3d6d6fd1 100644 --- a/src/Spring/Spring.Core/Collections/ImmutableSet.cs +++ b/src/Spring/Spring.Core/Collections/ImmutableSet.cs @@ -1,7 +1,5 @@ /* Copyright � 2002-2011 by Aidant Systems, Inc., and by Jason Smith. */ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -18,8 +16,6 @@ * limitations under the License. */ -#endregion - using System.Collections; namespace Spring.Collections; diff --git a/src/Spring/Spring.Core/Collections/LinkedList.cs b/src/Spring/Spring.Core/Collections/LinkedList.cs index f1a039a0..89a9fef7 100644 --- a/src/Spring/Spring.Core/Collections/LinkedList.cs +++ b/src/Spring/Spring.Core/Collections/LinkedList.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; namespace Spring.Collections; @@ -33,8 +29,6 @@ public class LinkedList : IList private Node _rootNode; private int _modId; - #region Constructors - /// /// Creates a new instance of the /// class. @@ -59,10 +53,6 @@ public class LinkedList : IList AddAll(list); } - #endregion - - #region IList Members - /// /// Is list read only? /// @@ -223,10 +213,6 @@ public class LinkedList : IList get { return false; } } - #endregion - - #region Private Methods - /// /// Checks whether the list can be modified. /// @@ -331,10 +317,6 @@ public class LinkedList : IList _modId++; } - #endregion - - #region ICollection Members - /// /// Returns if the list is synchronized across /// threads. @@ -424,10 +406,6 @@ public class LinkedList : IList get { return this; } } - #endregion - - #region IEnumerable Members - /// /// Gets an enumerator for the elements in the /// . @@ -446,10 +424,6 @@ public class LinkedList : IList return new LinkedListEnumerator(this); } - #endregion - - #region Inner Classes - [Serializable] private class Node { @@ -539,6 +513,4 @@ public class LinkedList : IList _current = _ll._rootNode; } } - - #endregion } diff --git a/src/Spring/Spring.Core/Collections/ListSet.cs b/src/Spring/Spring.Core/Collections/ListSet.cs index e695e9cf..79c17185 100644 --- a/src/Spring/Spring.Core/Collections/ListSet.cs +++ b/src/Spring/Spring.Core/Collections/ListSet.cs @@ -1,7 +1,5 @@ /* Copyright � 2002-2011 by Aidant Systems, Inc., and by Jason Smith. */ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -18,8 +16,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Collections.Specialized; diff --git a/src/Spring/Spring.Core/Collections/NoElementsException.cs b/src/Spring/Spring.Core/Collections/NoElementsException.cs index 383b1633..0b3e7154 100644 --- a/src/Spring/Spring.Core/Collections/NoElementsException.cs +++ b/src/Spring/Spring.Core/Collections/NoElementsException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Collections; diff --git a/src/Spring/Spring.Core/Collections/PriorityQueue.cs b/src/Spring/Spring.Core/Collections/PriorityQueue.cs index 7dd869fa..eb1875db 100644 --- a/src/Spring/Spring.Core/Collections/PriorityQueue.cs +++ b/src/Spring/Spring.Core/Collections/PriorityQueue.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Diagnostics; using System.Reflection; @@ -114,8 +110,6 @@ public class PriorityQueue : AbstractQueue, ISerializable } } - #region Private Fields - private const int DEFAULT_INITIAL_CAPACITY = 11; /// @@ -148,10 +142,6 @@ public class PriorityQueue : AbstractQueue, ISerializable /// [NonSerialized] private int _queueModificationCount = 0; - #endregion - - #region Constructors - /// /// Creates a with the default initial capacity /// (11) that orders its elements according to their natural @@ -225,10 +215,6 @@ public class PriorityQueue : AbstractQueue, ISerializable } } - #endregion - - #region Private Helper Methods - /// /// Common code to initialize underlying queue array across /// constructors below. @@ -459,10 +445,6 @@ public class PriorityQueue : AbstractQueue, ISerializable _queue = newQueue; } - #endregion - - #region Public Methods - /// /// Gets the Capacity of this queue. Will equal /// @@ -709,10 +691,6 @@ public class PriorityQueue : AbstractQueue, ISerializable return _comparator; } - #endregion - - #region ISerializable Implementation - /// /// Save the state of the instance to a stream (that /// is, serialize it). @@ -767,10 +745,6 @@ public class PriorityQueue : AbstractQueue, ISerializable } } - #endregion - - #region ICollection Implementation - /// ///Copies the elements of the to an , starting at a particular index. /// @@ -837,6 +811,4 @@ public class PriorityQueue : AbstractQueue, ISerializable { get { return _priorityQueueSize == 0; } } - - #endregion } diff --git a/src/Spring/Spring.Core/Collections/Set.cs b/src/Spring/Spring.Core/Collections/Set.cs index d5b33649..c4a62586 100644 --- a/src/Spring/Spring.Core/Collections/Set.cs +++ b/src/Spring/Spring.Core/Collections/Set.cs @@ -1,7 +1,5 @@ /* Copyright � 2002-2011 by Aidant Systems, Inc., and by Jason Smith. */ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -18,8 +16,6 @@ * limitations under the License. */ -#endregion - using System.Collections; namespace Spring.Collections; diff --git a/src/Spring/Spring.Core/Collections/SortedSet.cs b/src/Spring/Spring.Core/Collections/SortedSet.cs index 2c91411b..2bb75135 100644 --- a/src/Spring/Spring.Core/Collections/SortedSet.cs +++ b/src/Spring/Spring.Core/Collections/SortedSet.cs @@ -1,7 +1,5 @@ /* Copyright � 2002-2011 by Aidant Systems, Inc., and by Jason Smith. */ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -18,8 +16,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Spring.Util; diff --git a/src/Spring/Spring.Core/Collections/SynchronizedDictionaryEnumerator.cs b/src/Spring/Spring.Core/Collections/SynchronizedDictionaryEnumerator.cs index 3d2fa407..e6ec06ca 100644 --- a/src/Spring/Spring.Core/Collections/SynchronizedDictionaryEnumerator.cs +++ b/src/Spring/Spring.Core/Collections/SynchronizedDictionaryEnumerator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; namespace Spring.Collections; diff --git a/src/Spring/Spring.Core/Collections/SynchronizedEnumerator.cs b/src/Spring/Spring.Core/Collections/SynchronizedEnumerator.cs index ed8b37a4..2892084d 100644 --- a/src/Spring/Spring.Core/Collections/SynchronizedEnumerator.cs +++ b/src/Spring/Spring.Core/Collections/SynchronizedEnumerator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; namespace Spring.Collections; diff --git a/src/Spring/Spring.Core/Collections/SynchronizedSet.cs b/src/Spring/Spring.Core/Collections/SynchronizedSet.cs index efd2190f..18270181 100644 --- a/src/Spring/Spring.Core/Collections/SynchronizedSet.cs +++ b/src/Spring/Spring.Core/Collections/SynchronizedSet.cs @@ -1,7 +1,5 @@ /* Copyright � 2002-2011 by Aidant Systems, Inc., and by Jason Smith. */ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -18,8 +16,6 @@ * limitations under the License. */ -#endregion - using System.Collections; namespace Spring.Collections; diff --git a/src/Spring/Spring.Core/Context/ApplicationContextException.cs b/src/Spring/Spring.Core/Context/ApplicationContextException.cs index 0672cef2..60259e2e 100644 --- a/src/Spring/Spring.Core/Context/ApplicationContextException.cs +++ b/src/Spring/Spring.Core/Context/ApplicationContextException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Runtime.Serialization; using Spring.Objects; -#endregion - namespace Spring.Context; /// Exception thrown during application context initialization. diff --git a/src/Spring/Spring.Core/Context/ApplicationEventArgs.cs b/src/Spring/Spring.Core/Context/ApplicationEventArgs.cs index 0325d6cf..ed31642e 100644 --- a/src/Spring/Spring.Core/Context/ApplicationEventArgs.cs +++ b/src/Spring/Spring.Core/Context/ApplicationEventArgs.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Context; /// diff --git a/src/Spring/Spring.Core/Context/Attributes/AssemblyObjectDefinitionScanner.cs b/src/Spring/Spring.Core/Context/Attributes/AssemblyObjectDefinitionScanner.cs index 5fb73947..d934ff32 100644 --- a/src/Spring/Spring.Core/Context/Attributes/AssemblyObjectDefinitionScanner.cs +++ b/src/Spring/Spring.Core/Context/Attributes/AssemblyObjectDefinitionScanner.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using Microsoft.Extensions.Logging; using Spring.Objects.Factory.Support; diff --git a/src/Spring/Spring.Core/Context/Attributes/AssemblyTypeScanner.cs b/src/Spring/Spring.Core/Context/Attributes/AssemblyTypeScanner.cs index 5d89d52f..a7653002 100644 --- a/src/Spring/Spring.Core/Context/Attributes/AssemblyTypeScanner.cs +++ b/src/Spring/Spring.Core/Context/Attributes/AssemblyTypeScanner.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using Microsoft.Extensions.Logging; using Spring.Context.Attributes.TypeFilters; @@ -108,8 +104,6 @@ public abstract class AssemblyTypeScanner : IAssemblyTypeScanner set { _scanStartFolderPath = value; } } - #region IAssemblyTypeScanner Members - /// /// Assemblies the type of the having. /// @@ -249,8 +243,6 @@ public abstract class AssemblyTypeScanner : IAssemblyTypeScanner return this; } - #endregion - private List GetAllAssembliesInPath(string folderPath) { var assemblies = new List(); diff --git a/src/Spring/Spring.Core/Context/Attributes/AssemblyTypeSource.cs b/src/Spring/Spring.Core/Context/Attributes/AssemblyTypeSource.cs index bb886aba..79d88225 100644 --- a/src/Spring/Spring.Core/Context/Attributes/AssemblyTypeSource.cs +++ b/src/Spring/Spring.Core/Context/Attributes/AssemblyTypeSource.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Reflection; using Microsoft.Extensions.Logging; @@ -48,8 +44,6 @@ public class AssemblyTypeSource : IEnumerable _assembly = assembly; } - #region IEnumerable Members - /// /// Gets the enumerator. /// @@ -80,6 +74,4 @@ public class AssemblyTypeSource : IEnumerable { return GetEnumerator(); } - - #endregion } \ No newline at end of file diff --git a/src/Spring/Spring.Core/Context/Attributes/AttributeConfigUtils.cs b/src/Spring/Spring.Core/Context/Attributes/AttributeConfigUtils.cs index 2e120a2b..c22be2a4 100644 --- a/src/Spring/Spring.Core/Context/Attributes/AttributeConfigUtils.cs +++ b/src/Spring/Spring.Core/Context/Attributes/AttributeConfigUtils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2010-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects.Factory.Attributes; using Spring.Objects.Factory.Config; using Spring.Objects.Factory.Support; diff --git a/src/Spring/Spring.Core/Context/Attributes/AttributeObjectNameGenerator.cs b/src/Spring/Spring.Core/Context/Attributes/AttributeObjectNameGenerator.cs index 59e6c930..5d45d32b 100644 --- a/src/Spring/Spring.Core/Context/Attributes/AttributeObjectNameGenerator.cs +++ b/src/Spring/Spring.Core/Context/Attributes/AttributeObjectNameGenerator.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects.Factory.Config; using Spring.Objects.Factory.Support; diff --git a/src/Spring/Spring.Core/Context/Attributes/ConfigurationAttribute.cs b/src/Spring/Spring.Core/Context/Attributes/ConfigurationAttribute.cs index b77f2215..5d4a1879 100644 --- a/src/Spring/Spring.Core/Context/Attributes/ConfigurationAttribute.cs +++ b/src/Spring/Spring.Core/Context/Attributes/ConfigurationAttribute.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Stereotype; namespace Spring.Context.Attributes; diff --git a/src/Spring/Spring.Core/Context/Attributes/ConfigurationClass.cs b/src/Spring/Spring.Core/Context/Attributes/ConfigurationClass.cs index 7dd9a89e..78e2ad40 100644 --- a/src/Spring/Spring.Core/Context/Attributes/ConfigurationClass.cs +++ b/src/Spring/Spring.Core/Context/Attributes/ConfigurationClass.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using System.Text; using Spring.Core.IO; diff --git a/src/Spring/Spring.Core/Context/Attributes/ConfigurationClassAssemblyResource.cs b/src/Spring/Spring.Core/Context/Attributes/ConfigurationClassAssemblyResource.cs index 0d3882f0..f7865b79 100644 --- a/src/Spring/Spring.Core/Context/Attributes/ConfigurationClassAssemblyResource.cs +++ b/src/Spring/Spring.Core/Context/Attributes/ConfigurationClassAssemblyResource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2010-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using Spring.Core.IO; @@ -41,8 +37,6 @@ public class ConfigurationClassAssemblyResource : IResource _containingAssemblyFileName = Assembly.GetAssembly(_type.GetType()).Location; } - #region IResource Members - /// /// Creates a resource relative to this resource. /// @@ -195,6 +189,4 @@ public class ConfigurationClassAssemblyResource : IResource { get { throw new InvalidOperationException(); } } - - #endregion } diff --git a/src/Spring/Spring.Core/Context/Attributes/ConfigurationClassEnhancer.cs b/src/Spring/Spring.Core/Context/Attributes/ConfigurationClassEnhancer.cs index 04e6b414..614fd010 100644 --- a/src/Spring/Spring.Core/Context/Attributes/ConfigurationClassEnhancer.cs +++ b/src/Spring/Spring.Core/Context/Attributes/ConfigurationClassEnhancer.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Reflection; using System.Reflection.Emit; @@ -83,12 +79,8 @@ public class ConfigurationClassEnhancer private sealed class ConfigurationClassInterceptor : IConfigurationClassInterceptor { - #region Logging - private static readonly ILogger Logger = LogManager.GetLogger(); - #endregion - private readonly IConfigurableListableObjectFactory _configurableListableObjectFactory; public ConfigurationClassInterceptor(IConfigurableListableObjectFactory configurableListableObjectFactory) @@ -127,8 +119,6 @@ public class ConfigurationClassEnhancer } } - #region Proxy builder classes definition - private sealed class ConfigurationClassProxyTypeBuilder : InheritanceProxyTypeBuilder { private FieldBuilder interceptorField; @@ -277,6 +267,4 @@ public class ConfigurationClassEnhancer } } } - - #endregion } diff --git a/src/Spring/Spring.Core/Context/Attributes/ConfigurationClassMethod.cs b/src/Spring/Spring.Core/Context/Attributes/ConfigurationClassMethod.cs index cf4a9187..9edeeb55 100644 --- a/src/Spring/Spring.Core/Context/Attributes/ConfigurationClassMethod.cs +++ b/src/Spring/Spring.Core/Context/Attributes/ConfigurationClassMethod.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using Spring.Objects.Factory.Parsing; diff --git a/src/Spring/Spring.Core/Context/Attributes/ConfigurationClassObjectDefinitionReader.cs b/src/Spring/Spring.Core/Context/Attributes/ConfigurationClassObjectDefinitionReader.cs index 39a0413e..122c43f3 100644 --- a/src/Spring/Spring.Core/Context/Attributes/ConfigurationClassObjectDefinitionReader.cs +++ b/src/Spring/Spring.Core/Context/Attributes/ConfigurationClassObjectDefinitionReader.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region - using System.Reflection; using Microsoft.Extensions.Logging; using Spring.Core.TypeResolution; @@ -28,8 +22,6 @@ using Spring.Objects.Factory.Parsing; using Spring.Objects.Factory.Support; using Spring.Stereotype; -#endregion - namespace Spring.Context.Attributes; /// diff --git a/src/Spring/Spring.Core/Context/Attributes/ConfigurationClassParser.cs b/src/Spring/Spring.Core/Context/Attributes/ConfigurationClassParser.cs index 25314828..ce505e99 100644 --- a/src/Spring/Spring.Core/Context/Attributes/ConfigurationClassParser.cs +++ b/src/Spring/Spring.Core/Context/Attributes/ConfigurationClassParser.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects.Factory.Parsing; using Spring.Collections.Generic; using System.Reflection; diff --git a/src/Spring/Spring.Core/Context/Attributes/ConfigurationClassPostProcessor.cs b/src/Spring/Spring.Core/Context/Attributes/ConfigurationClassPostProcessor.cs index a9469c41..75c8bd33 100644 --- a/src/Spring/Spring.Core/Context/Attributes/ConfigurationClassPostProcessor.cs +++ b/src/Spring/Spring.Core/Context/Attributes/ConfigurationClassPostProcessor.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using Spring.Core; using Spring.Objects.Factory; diff --git a/src/Spring/Spring.Core/Context/Attributes/DependsOnAttribute.cs b/src/Spring/Spring.Core/Context/Attributes/DependsOnAttribute.cs index 540908d0..f148ce15 100644 --- a/src/Spring/Spring.Core/Context/Attributes/DependsOnAttribute.cs +++ b/src/Spring/Spring.Core/Context/Attributes/DependsOnAttribute.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Context.Attributes; /// diff --git a/src/Spring/Spring.Core/Context/Attributes/IAssemblyTypeScanner.cs b/src/Spring/Spring.Core/Context/Attributes/IAssemblyTypeScanner.cs index eb2b3dc0..eb865f79 100644 --- a/src/Spring/Spring.Core/Context/Attributes/IAssemblyTypeScanner.cs +++ b/src/Spring/Spring.Core/Context/Attributes/IAssemblyTypeScanner.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; namespace Spring.Context.Attributes; diff --git a/src/Spring/Spring.Core/Context/Attributes/ImportAttribute.cs b/src/Spring/Spring.Core/Context/Attributes/ImportAttribute.cs index 8efdeb1e..653de313 100644 --- a/src/Spring/Spring.Core/Context/Attributes/ImportAttribute.cs +++ b/src/Spring/Spring.Core/Context/Attributes/ImportAttribute.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Context.Attributes; /// diff --git a/src/Spring/Spring.Core/Context/Attributes/ImportResourceAttribute.cs b/src/Spring/Spring.Core/Context/Attributes/ImportResourceAttribute.cs index 0f54e1c8..70a8aa20 100644 --- a/src/Spring/Spring.Core/Context/Attributes/ImportResourceAttribute.cs +++ b/src/Spring/Spring.Core/Context/Attributes/ImportResourceAttribute.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Core.IO; using Spring.Objects.Factory.Support; using Spring.Objects.Factory.Xml; diff --git a/src/Spring/Spring.Core/Context/Attributes/LazyAttribute.cs b/src/Spring/Spring.Core/Context/Attributes/LazyAttribute.cs index 32c2f157..225235f1 100644 --- a/src/Spring/Spring.Core/Context/Attributes/LazyAttribute.cs +++ b/src/Spring/Spring.Core/Context/Attributes/LazyAttribute.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Context.Attributes; /// diff --git a/src/Spring/Spring.Core/Context/Attributes/ObjectDefAttribute.cs b/src/Spring/Spring.Core/Context/Attributes/ObjectDefAttribute.cs index 18f426c1..8640638c 100644 --- a/src/Spring/Spring.Core/Context/Attributes/ObjectDefAttribute.cs +++ b/src/Spring/Spring.Core/Context/Attributes/ObjectDefAttribute.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Util; namespace Spring.Context.Attributes; diff --git a/src/Spring/Spring.Core/Context/Attributes/RequiredConstraintAssemblyTypeScanner.cs b/src/Spring/Spring.Core/Context/Attributes/RequiredConstraintAssemblyTypeScanner.cs index 4fb46edd..0c2f167b 100644 --- a/src/Spring/Spring.Core/Context/Attributes/RequiredConstraintAssemblyTypeScanner.cs +++ b/src/Spring/Spring.Core/Context/Attributes/RequiredConstraintAssemblyTypeScanner.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Context.Attributes; /// diff --git a/src/Spring/Spring.Core/Context/Attributes/ScannedGenericObjectDefinition.cs b/src/Spring/Spring.Core/Context/Attributes/ScannedGenericObjectDefinition.cs index af1bc453..f7e6403d 100644 --- a/src/Spring/Spring.Core/Context/Attributes/ScannedGenericObjectDefinition.cs +++ b/src/Spring/Spring.Core/Context/Attributes/ScannedGenericObjectDefinition.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using Spring.Objects; using Spring.Objects.Factory.Config; diff --git a/src/Spring/Spring.Core/Context/Attributes/ScopeAttribute.cs b/src/Spring/Spring.Core/Context/Attributes/ScopeAttribute.cs index 0c414a04..7df7fc7d 100644 --- a/src/Spring/Spring.Core/Context/Attributes/ScopeAttribute.cs +++ b/src/Spring/Spring.Core/Context/Attributes/ScopeAttribute.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects.Factory.Support; namespace Spring.Context.Attributes; diff --git a/src/Spring/Spring.Core/Context/Attributes/TypeFilters/AbstractLoadTypeFilter.cs b/src/Spring/Spring.Core/Context/Attributes/TypeFilters/AbstractLoadTypeFilter.cs index 93a81419..4532d80d 100644 --- a/src/Spring/Spring.Core/Context/Attributes/TypeFilters/AbstractLoadTypeFilter.cs +++ b/src/Spring/Spring.Core/Context/Attributes/TypeFilters/AbstractLoadTypeFilter.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using Spring.Core.TypeResolution; diff --git a/src/Spring/Spring.Core/Context/Attributes/TypeFilters/AssignableTypeFilter.cs b/src/Spring/Spring.Core/Context/Attributes/TypeFilters/AssignableTypeFilter.cs index 228c4597..4f712e40 100644 --- a/src/Spring/Spring.Core/Context/Attributes/TypeFilters/AssignableTypeFilter.cs +++ b/src/Spring/Spring.Core/Context/Attributes/TypeFilters/AssignableTypeFilter.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Context.Attributes.TypeFilters; /// diff --git a/src/Spring/Spring.Core/Context/Attributes/TypeFilters/AttributeTypeFilter.cs b/src/Spring/Spring.Core/Context/Attributes/TypeFilters/AttributeTypeFilter.cs index 56430e4e..a84b5848 100644 --- a/src/Spring/Spring.Core/Context/Attributes/TypeFilters/AttributeTypeFilter.cs +++ b/src/Spring/Spring.Core/Context/Attributes/TypeFilters/AttributeTypeFilter.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Context.Attributes.TypeFilters; /// diff --git a/src/Spring/Spring.Core/Context/Attributes/TypeFilters/CustomTypeFactory.cs b/src/Spring/Spring.Core/Context/Attributes/TypeFilters/CustomTypeFactory.cs index 6be453ce..b757753f 100644 --- a/src/Spring/Spring.Core/Context/Attributes/TypeFilters/CustomTypeFactory.cs +++ b/src/Spring/Spring.Core/Context/Attributes/TypeFilters/CustomTypeFactory.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using Spring.Core.TypeResolution; using Spring.Util; diff --git a/src/Spring/Spring.Core/Context/Attributes/TypeFilters/ITypeFilter.cs b/src/Spring/Spring.Core/Context/Attributes/TypeFilters/ITypeFilter.cs index ac7171b3..014d0033 100644 --- a/src/Spring/Spring.Core/Context/Attributes/TypeFilters/ITypeFilter.cs +++ b/src/Spring/Spring.Core/Context/Attributes/TypeFilters/ITypeFilter.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Context.Attributes.TypeFilters; /// diff --git a/src/Spring/Spring.Core/Context/Attributes/TypeFilters/RegexPatternTypeFilter.cs b/src/Spring/Spring.Core/Context/Attributes/TypeFilters/RegexPatternTypeFilter.cs index a037d443..ad137c74 100644 --- a/src/Spring/Spring.Core/Context/Attributes/TypeFilters/RegexPatternTypeFilter.cs +++ b/src/Spring/Spring.Core/Context/Attributes/TypeFilters/RegexPatternTypeFilter.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Text.RegularExpressions; namespace Spring.Context.Attributes.TypeFilters; diff --git a/src/Spring/Spring.Core/Context/Config/AttributeConfigObjectDefinitionParser.cs b/src/Spring/Spring.Core/Context/Config/AttributeConfigObjectDefinitionParser.cs index c4f2a7f2..77fef56a 100644 --- a/src/Spring/Spring.Core/Context/Config/AttributeConfigObjectDefinitionParser.cs +++ b/src/Spring/Spring.Core/Context/Config/AttributeConfigObjectDefinitionParser.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2010-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Xml; using Spring.Context.Attributes; using Spring.Objects.Factory.Config; diff --git a/src/Spring/Spring.Core/Context/Config/ComponentScanObjectDefinitionParser.cs b/src/Spring/Spring.Core/Context/Config/ComponentScanObjectDefinitionParser.cs index 4b99be58..7092841c 100644 --- a/src/Spring/Spring.Core/Context/Config/ComponentScanObjectDefinitionParser.cs +++ b/src/Spring/Spring.Core/Context/Config/ComponentScanObjectDefinitionParser.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2010-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.ComponentModel; using System.Xml; using Microsoft.Extensions.Logging; diff --git a/src/Spring/Spring.Core/Context/Config/ContextNamespaceParser.cs b/src/Spring/Spring.Core/Context/Config/ContextNamespaceParser.cs index 91938447..11a7cc09 100644 --- a/src/Spring/Spring.Core/Context/Config/ContextNamespaceParser.cs +++ b/src/Spring/Spring.Core/Context/Config/ContextNamespaceParser.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects.Factory.Xml; namespace Spring.Context.Config; diff --git a/src/Spring/Spring.Core/Context/EventListenerAttribute.cs b/src/Spring/Spring.Core/Context/EventListenerAttribute.cs index 4c91810f..ee00f511 100644 --- a/src/Spring/Spring.Core/Context/EventListenerAttribute.cs +++ b/src/Spring/Spring.Core/Context/EventListenerAttribute.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Context; /// diff --git a/src/Spring/Spring.Core/Context/Events/ConsoleListener.cs b/src/Spring/Spring.Core/Context/Events/ConsoleListener.cs index 59fd898f..1fb21f45 100644 --- a/src/Spring/Spring.Core/Context/Events/ConsoleListener.cs +++ b/src/Spring/Spring.Core/Context/Events/ConsoleListener.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Context.Events; /// diff --git a/src/Spring/Spring.Core/Context/Events/ContextEventArgs.cs b/src/Spring/Spring.Core/Context/Events/ContextEventArgs.cs index d4a9be17..3917fae3 100644 --- a/src/Spring/Spring.Core/Context/Events/ContextEventArgs.cs +++ b/src/Spring/Spring.Core/Context/Events/ContextEventArgs.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; namespace Spring.Context.Events; diff --git a/src/Spring/Spring.Core/Context/Extension/GenericApplicationContextExtensions.cs b/src/Spring/Spring.Core/Context/Extension/GenericApplicationContextExtensions.cs index d7f5cc2c..252e98cf 100644 --- a/src/Spring/Spring.Core/Context/Extension/GenericApplicationContextExtensions.cs +++ b/src/Spring/Spring.Core/Context/Extension/GenericApplicationContextExtensions.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using Spring.Context.Attributes; using Spring.Objects.Factory.Support; diff --git a/src/Spring/Spring.Core/Context/IApplicationContext.cs b/src/Spring/Spring.Core/Context/IApplicationContext.cs index 4323311f..ec95a53a 100644 --- a/src/Spring/Spring.Core/Context/IApplicationContext.cs +++ b/src/Spring/Spring.Core/Context/IApplicationContext.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Core.IO; using Spring.Objects.Events; using Spring.Objects.Factory; -#endregion - namespace Spring.Context; /// diff --git a/src/Spring/Spring.Core/Context/IApplicationContextAware.cs b/src/Spring/Spring.Core/Context/IApplicationContextAware.cs index 401ab2e2..a8b95fea 100644 --- a/src/Spring/Spring.Core/Context/IApplicationContextAware.cs +++ b/src/Spring/Spring.Core/Context/IApplicationContextAware.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Context; /// diff --git a/src/Spring/Spring.Core/Context/IApplicationEventListener.cs b/src/Spring/Spring.Core/Context/IApplicationEventListener.cs index 12a8953b..33cfa348 100644 --- a/src/Spring/Spring.Core/Context/IApplicationEventListener.cs +++ b/src/Spring/Spring.Core/Context/IApplicationEventListener.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Context; /// diff --git a/src/Spring/Spring.Core/Context/IApplicationEventPublisher.cs b/src/Spring/Spring.Core/Context/IApplicationEventPublisher.cs index d004ad7a..2a6b5423 100644 --- a/src/Spring/Spring.Core/Context/IApplicationEventPublisher.cs +++ b/src/Spring/Spring.Core/Context/IApplicationEventPublisher.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Context; /// diff --git a/src/Spring/Spring.Core/Context/IConfigurableApplicationContext.cs b/src/Spring/Spring.Core/Context/IConfigurableApplicationContext.cs index 239d595f..7013e2df 100644 --- a/src/Spring/Spring.Core/Context/IConfigurableApplicationContext.cs +++ b/src/Spring/Spring.Core/Context/IConfigurableApplicationContext.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects.Factory.Config; namespace Spring.Context; diff --git a/src/Spring/Spring.Core/Context/IHierarchicalMessageSource.cs b/src/Spring/Spring.Core/Context/IHierarchicalMessageSource.cs index 2a1e399d..07c23869 100644 --- a/src/Spring/Spring.Core/Context/IHierarchicalMessageSource.cs +++ b/src/Spring/Spring.Core/Context/IHierarchicalMessageSource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Context; /// diff --git a/src/Spring/Spring.Core/Context/ILifecycle.cs b/src/Spring/Spring.Core/Context/ILifecycle.cs index 5a1cfce3..3adf1023 100644 --- a/src/Spring/Spring.Core/Context/ILifecycle.cs +++ b/src/Spring/Spring.Core/Context/ILifecycle.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Context; /// diff --git a/src/Spring/Spring.Core/Context/IMessageSource.cs b/src/Spring/Spring.Core/Context/IMessageSource.cs index 9bbffc20..c45a93bf 100644 --- a/src/Spring/Spring.Core/Context/IMessageSource.cs +++ b/src/Spring/Spring.Core/Context/IMessageSource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; namespace Spring.Context; diff --git a/src/Spring/Spring.Core/Context/IMessageSourceAware.cs b/src/Spring/Spring.Core/Context/IMessageSourceAware.cs index 7df7e1e6..cc179bf0 100644 --- a/src/Spring/Spring.Core/Context/IMessageSourceAware.cs +++ b/src/Spring/Spring.Core/Context/IMessageSourceAware.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Context; /// diff --git a/src/Spring/Spring.Core/Context/IMessageSourceResolvable.cs b/src/Spring/Spring.Core/Context/IMessageSourceResolvable.cs index 6e3ecc8d..709a9464 100644 --- a/src/Spring/Spring.Core/Context/IMessageSourceResolvable.cs +++ b/src/Spring/Spring.Core/Context/IMessageSourceResolvable.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; namespace Spring.Context; diff --git a/src/Spring/Spring.Core/Context/IResourceLoaderAware.cs b/src/Spring/Spring.Core/Context/IResourceLoaderAware.cs index 31203af4..31cf4c39 100644 --- a/src/Spring/Spring.Core/Context/IResourceLoaderAware.cs +++ b/src/Spring/Spring.Core/Context/IResourceLoaderAware.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Core.IO; -#endregion - namespace Spring.Context; /// diff --git a/src/Spring/Spring.Core/Context/NoSuchMessageException.cs b/src/Spring/Spring.Core/Context/NoSuchMessageException.cs index adefc0de..5fa7f24c 100644 --- a/src/Spring/Spring.Core/Context/NoSuchMessageException.cs +++ b/src/Spring/Spring.Core/Context/NoSuchMessageException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Globalization; using System.Runtime.Serialization; -#endregion - namespace Spring.Context; /// diff --git a/src/Spring/Spring.Core/Context/Support/AbstractMessageSource.cs b/src/Spring/Spring.Core/Context/Support/AbstractMessageSource.cs index 6fca2def..9608731a 100644 --- a/src/Spring/Spring.Core/Context/Support/AbstractMessageSource.cs +++ b/src/Spring/Spring.Core/Context/Support/AbstractMessageSource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using Microsoft.Extensions.Logging; @@ -56,8 +52,6 @@ namespace Spring.Context.Support; /// public abstract class AbstractMessageSource : IHierarchicalMessageSource { - #region Fields - /// /// holds the logger instance shared with subclasses. /// @@ -66,10 +60,6 @@ public abstract class AbstractMessageSource : IHierarchicalMessageSource private IMessageSource parentMessageSource; private bool useCodeAsDefaultMessage = false; - #endregion - - #region Constructor - /// /// Initializes this instance. /// @@ -78,10 +68,6 @@ public abstract class AbstractMessageSource : IHierarchicalMessageSource log = LogManager.GetLogger(GetType()); } - #endregion - - #region Properties - /// Gets or Sets a value indicating whether to use the message code as /// default message instead of throwing a NoSuchMessageException. /// Useful for development and debugging. Default is "false". @@ -110,10 +96,6 @@ public abstract class AbstractMessageSource : IHierarchicalMessageSource set { useCodeAsDefaultMessage = value; } } - #endregion - - #region IHierarchicalMessageSource Members - /// /// The parent message source used to try and resolve messages that /// this object can't resolve. @@ -371,10 +353,6 @@ public abstract class AbstractMessageSource : IHierarchicalMessageSource if (ParentMessageSource != null) ParentMessageSource.ApplyResources(value, objectName, culture); } - #endregion - - #region Protected Methods - /// Resolve the given code and arguments as message in the given culture, /// returning null if not found. Does not fall back to the code /// as default message. Invoked by GetMessage methods. @@ -554,10 +532,6 @@ public abstract class AbstractMessageSource : IHierarchicalMessageSource ApplyResourcesToObject(value, objectName, cultureInfo); } - #endregion - - #region Protected Abstract Methods - /// /// Subclasses must implement this method to resolve a message. /// @@ -605,6 +579,4 @@ public abstract class AbstractMessageSource : IHierarchicalMessageSource /// resource is associated. /// protected abstract void ApplyResourcesToObject(object value, string objectName, CultureInfo cultureInfo); - - #endregion } \ No newline at end of file diff --git a/src/Spring/Spring.Core/Context/Support/AbstractXmlApplicationContext.cs b/src/Spring/Spring.Core/Context/Support/AbstractXmlApplicationContext.cs index 2ba24b6c..b59e95df 100644 --- a/src/Spring/Spring.Core/Context/Support/AbstractXmlApplicationContext.cs +++ b/src/Spring/Spring.Core/Context/Support/AbstractXmlApplicationContext.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using Spring.Objects; using Spring.Objects.Factory.Config; @@ -144,16 +140,12 @@ public abstract class AbstractXmlApplicationContext : AbstractApplicationContext _objectFactory = objectFactory; - #region Instrumentation - if (log.IsEnabled(LogLevel.Debug)) { log.LogDebug(string.Format( "Refreshed ObjectFactory for application context '{0}'.", Name)); } - - #endregion } catch (IOException ex) { diff --git a/src/Spring/Spring.Core/Context/Support/AbstractXmlApplicationContextArgs.cs b/src/Spring/Spring.Core/Context/Support/AbstractXmlApplicationContextArgs.cs index 9b8c0752..143c41c9 100644 --- a/src/Spring/Spring.Core/Context/Support/AbstractXmlApplicationContextArgs.cs +++ b/src/Spring/Spring.Core/Context/Support/AbstractXmlApplicationContextArgs.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Core.IO; namespace Spring.Context.Support; diff --git a/src/Spring/Spring.Core/Context/Support/ApplicationContextAwareProcessor.cs b/src/Spring/Spring.Core/Context/Support/ApplicationContextAwareProcessor.cs index ffaebb0c..238eb692 100644 --- a/src/Spring/Spring.Core/Context/Support/ApplicationContextAwareProcessor.cs +++ b/src/Spring/Spring.Core/Context/Support/ApplicationContextAwareProcessor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Remoting; using Spring.Objects.Factory.Config; diff --git a/src/Spring/Spring.Core/Context/Support/ApplicationObjectSupport.cs b/src/Spring/Spring.Core/Context/Support/ApplicationObjectSupport.cs index f446a787..b51e8823 100644 --- a/src/Spring/Spring.Core/Context/Support/ApplicationObjectSupport.cs +++ b/src/Spring/Spring.Core/Context/Support/ApplicationObjectSupport.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects; namespace Spring.Context.Support; @@ -134,8 +130,6 @@ public abstract class ApplicationObjectSupport : IApplicationContextAware get { return _messageSourceAccessor; } } - #region IApplicationContextAware Members - /// /// Gets or sets the that this /// object runs in. @@ -200,6 +194,4 @@ public abstract class ApplicationObjectSupport : IApplicationContextAware return false; } - - #endregion } diff --git a/src/Spring/Spring.Core/Context/Support/CodeConfigApplicationContext.cs b/src/Spring/Spring.Core/Context/Support/CodeConfigApplicationContext.cs index 3d4c75ef..91111ae3 100644 --- a/src/Spring/Spring.Core/Context/Support/CodeConfigApplicationContext.cs +++ b/src/Spring/Spring.Core/Context/Support/CodeConfigApplicationContext.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects.Factory.Support; namespace Spring.Context.Support; diff --git a/src/Spring/Spring.Core/Context/Support/ContextHandler.cs b/src/Spring/Spring.Core/Context/Support/ContextHandler.cs index 2facc8bd..fe41116f 100644 --- a/src/Spring/Spring.Core/Context/Support/ContextHandler.cs +++ b/src/Spring/Spring.Core/Context/Support/ContextHandler.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2005 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Configuration; using System.Reflection; using System.Xml; @@ -29,8 +23,6 @@ using Spring.Core.TypeResolution; using Spring.Reflection.Dynamic; using Spring.Util; -#endregion - namespace Spring.Context.Support; /// @@ -239,8 +231,6 @@ public class ContextHandler : IConfigurationSectionHandler { XmlElement contextElement = section as XmlElement; - #region Sanity Checks - if (contextElement == null) { throw ConfigurationUtils.CreateConfigurationException( @@ -254,8 +244,6 @@ public class ContextHandler : IConfigurationSectionHandler String.Format("Parent context must be of type IApplicationContext, but was '{0}'", parent.GetType().FullName)); } - #endregion - // determine name of context to be created string contextName = GetContextName(configContext, contextElement); if (!StringUtils.HasLength(contextName)) @@ -263,12 +251,8 @@ public class ContextHandler : IConfigurationSectionHandler contextName = AbstractApplicationContext.DefaultRootContextName; } - #region Instrumentation - if (Log.IsEnabled(LogLevel.Debug)) Log.LogDebug(string.Format("creating context '{0}'", contextName)); - #endregion - IApplicationContext context = null; try { @@ -489,8 +473,6 @@ public class ContextHandler : IConfigurationSectionHandler return contextNodes; } - #region Inner Class : ContextInstantiator - private abstract class ContextInstantiator { protected ContextInstantiator( @@ -546,10 +528,6 @@ public class ContextHandler : IConfigurationSectionHandler private IList _resources; } - #endregion - - #region Inner Class : RootContextInstantiator - private sealed class RootContextInstantiator : ContextInstantiator { public RootContextInstantiator( @@ -570,10 +548,6 @@ public class ContextHandler : IConfigurationSectionHandler } } - #endregion - - #region Inner Class : DescendantContextInstantiator - private sealed class DescendantContextInstantiator : ContextInstantiator { public DescendantContextInstantiator( @@ -599,10 +573,6 @@ public class ContextHandler : IConfigurationSectionHandler private IApplicationContext parentContext; } - #endregion - - #region Context Schema Constants - /// /// Constants defining the structure and values associated with the /// schema for laying out Spring.NET contexts in XML. @@ -653,6 +623,4 @@ public class ContextHandler : IConfigurationSectionHandler /// public const string URIAttribute = "uri"; } - - #endregion } diff --git a/src/Spring/Spring.Core/Context/Support/ContextRegistry.cs b/src/Spring/Spring.Core/Context/Support/ContextRegistry.cs index b82e679d..11ad4c02 100644 --- a/src/Spring/Spring.Core/Context/Support/ContextRegistry.cs +++ b/src/Spring/Spring.Core/Context/Support/ContextRegistry.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using Spring.Context.Events; using Spring.Util; @@ -55,10 +51,6 @@ public sealed class ContextRegistry private IDictionary contextMap = new Dictionary(StringComparer.OrdinalIgnoreCase); - #region Constructor (s) / Destructor - - // CLOVER:OFF - /// /// Creates a new instance of the ContextRegistry class. /// @@ -72,10 +64,6 @@ public sealed class ContextRegistry { } - // CLOVER:ON - - #endregion - /// /// This event is fired, if ContextRegistry.Clear() is called.
/// Clients may register to get informed @@ -167,15 +155,11 @@ public sealed class ContextRegistry instance.contextMap[context.Name] = context; context.ContextEvent += OnContextEvent; - #region Instrumentation - if (log.IsEnabled(LogLevel.Debug)) { log.LogDebug(String.Format("Registering context '{0}' under name '{1}'.", context, context.Name)); } - #endregion - if (rootContextName == null) { rootContextName = context.Name; @@ -284,16 +268,12 @@ public sealed class ContextRegistry name)); } - #region Instrumentation - if (log.IsEnabled(LogLevel.Debug)) { log.LogDebug(String.Format( "Returning context '{0}' registered under name '{1}'.", ctx, name)); } - #endregion - return ctx; } } @@ -384,4 +364,4 @@ public sealed class ContextRegistry rootContextCurrentlyInCreation = false; } } -} \ No newline at end of file +} diff --git a/src/Spring/Spring.Core/Context/Support/DefaultMessageSourceResolvable.cs b/src/Spring/Spring.Core/Context/Support/DefaultMessageSourceResolvable.cs index f8a7cd1c..3c6f469f 100644 --- a/src/Spring/Spring.Core/Context/Support/DefaultMessageSourceResolvable.cs +++ b/src/Spring/Spring.Core/Context/Support/DefaultMessageSourceResolvable.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using Spring.Util; @@ -43,8 +39,6 @@ public class DefaultMessageSourceResolvable : IMessageSourceResolvable private object[] arguments; private string defaultMessage; - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// class @@ -121,8 +115,6 @@ public class DefaultMessageSourceResolvable : IMessageSourceResolvable { } - #endregion - /// /// Return the default code for this resolvable. /// @@ -174,8 +166,6 @@ public class DefaultMessageSourceResolvable : IMessageSourceResolvable return visitor.VisitMessageSourceResolvableString(this); } - #region IMessageSourceResolvable Members - /// /// Return the codes to be used to resolve this message, in the order /// that they are to be tried. @@ -215,6 +205,4 @@ public class DefaultMessageSourceResolvable : IMessageSourceResolvable { get { return defaultMessage; } } - - #endregion } diff --git a/src/Spring/Spring.Core/Context/Support/DefaultSectionHandler.cs b/src/Spring/Spring.Core/Context/Support/DefaultSectionHandler.cs index b6e8b77d..e9400ffd 100644 --- a/src/Spring/Spring.Core/Context/Support/DefaultSectionHandler.cs +++ b/src/Spring/Spring.Core/Context/Support/DefaultSectionHandler.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Configuration; using System.Xml; -#endregion - namespace Spring.Context.Support; /// @@ -38,8 +30,6 @@ namespace Spring.Context.Support; /// Aleksandar Seovic public class DefaultSectionHandler : IConfigurationSectionHandler { - #region Methods - /// /// Returns the configuration section as an /// @@ -60,6 +50,4 @@ public class DefaultSectionHandler : IConfigurationSectionHandler { return section as XmlElement; } - - #endregion } diff --git a/src/Spring/Spring.Core/Context/Support/DelegatingMessageSource.cs b/src/Spring/Spring.Core/Context/Support/DelegatingMessageSource.cs index 2c5c9638..6218f562 100644 --- a/src/Spring/Spring.Core/Context/Support/DelegatingMessageSource.cs +++ b/src/Spring/Spring.Core/Context/Support/DelegatingMessageSource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Globalization; using Spring.Util; -#endregion - namespace Spring.Context.Support; /// @@ -51,14 +43,8 @@ namespace Spring.Context.Support; /// public class DelegatingMessageSource : IHierarchicalMessageSource { - #region Fields - private IMessageSource _parentMessageSource; - #endregion - - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// class. @@ -80,10 +66,6 @@ public class DelegatingMessageSource : IHierarchicalMessageSource ParentMessageSource = parentMessageSource; } - #endregion - - #region Properties - /// /// The parent message source used to try and resolve messages that /// this object can't resolve. @@ -103,10 +85,6 @@ public class DelegatingMessageSource : IHierarchicalMessageSource set { _parentMessageSource = value; } } - #endregion - - #region Methods - /// /// Resolve the message identified by the supplied /// . @@ -315,10 +293,6 @@ public class DelegatingMessageSource : IHierarchicalMessageSource ParentMessageSource.ApplyResources(value, objectName, culture); } - #endregion - - #region Inner Class : SpecialCaseNullMessageSource - private sealed class SpecialCaseNullMessageSource : IMessageSource { public string GetMessage(string name) @@ -381,6 +355,4 @@ public class DelegatingMessageSource : IHierarchicalMessageSource value, objectName, culture)); } } - - #endregion } diff --git a/src/Spring/Spring.Core/Context/Support/GenericApplicationContext.cs b/src/Spring/Spring.Core/Context/Support/GenericApplicationContext.cs index c177b0c6..7ad72dbf 100644 --- a/src/Spring/Spring.Core/Context/Support/GenericApplicationContext.cs +++ b/src/Spring/Spring.Core/Context/Support/GenericApplicationContext.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects.Factory.Config; using Spring.Objects.Factory.Support; using Spring.Util; diff --git a/src/Spring/Spring.Core/Context/Support/MessageSourceAccessor.cs b/src/Spring/Spring.Core/Context/Support/MessageSourceAccessor.cs index d650b4c9..6c514fac 100644 --- a/src/Spring/Spring.Core/Context/Support/MessageSourceAccessor.cs +++ b/src/Spring/Spring.Core/Context/Support/MessageSourceAccessor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Globalization; -#endregion - namespace Spring.Context.Support; /// diff --git a/src/Spring/Spring.Core/Context/Support/MessageSourceResolvableVisitor.cs b/src/Spring/Spring.Core/Context/Support/MessageSourceResolvableVisitor.cs index 0b6c2e73..f0045b46 100644 --- a/src/Spring/Spring.Core/Context/Support/MessageSourceResolvableVisitor.cs +++ b/src/Spring/Spring.Core/Context/Support/MessageSourceResolvableVisitor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Text; using Spring.Util; -#endregion - namespace Spring.Context.Support; /// diff --git a/src/Spring/Spring.Core/Context/Support/NamespaceParsersSectionHandler.cs b/src/Spring/Spring.Core/Context/Support/NamespaceParsersSectionHandler.cs index 2253b843..a2d4b5af 100644 --- a/src/Spring/Spring.Core/Context/Support/NamespaceParsersSectionHandler.cs +++ b/src/Spring/Spring.Core/Context/Support/NamespaceParsersSectionHandler.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Configuration; using System.Globalization; using System.Xml; @@ -27,8 +21,6 @@ using Spring.Core.TypeResolution; using Spring.Objects.Factory.Xml; using Spring.Util; -#endregion - namespace Spring.Context.Support; /// diff --git a/src/Spring/Spring.Core/Context/Support/NullMessageSource.cs b/src/Spring/Spring.Core/Context/Support/NullMessageSource.cs index 1d4b375b..6c61f6e4 100644 --- a/src/Spring/Spring.Core/Context/Support/NullMessageSource.cs +++ b/src/Spring/Spring.Core/Context/Support/NullMessageSource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; namespace Spring.Context.Support; diff --git a/src/Spring/Spring.Core/Context/Support/ResourceHandlersSectionHandler.cs b/src/Spring/Spring.Core/Context/Support/ResourceHandlersSectionHandler.cs index b589be08..ddd21d34 100644 --- a/src/Spring/Spring.Core/Context/Support/ResourceHandlersSectionHandler.cs +++ b/src/Spring/Spring.Core/Context/Support/ResourceHandlersSectionHandler.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Configuration; using System.Globalization; using System.Xml; using Spring.Core.IO; using Spring.Util; -#endregion - namespace Spring.Context.Support; /// diff --git a/src/Spring/Spring.Core/Context/Support/ResourceSetMessageSource.cs b/src/Spring/Spring.Core/Context/Support/ResourceSetMessageSource.cs index ac6aaa5c..9a72e73e 100644 --- a/src/Spring/Spring.Core/Context/Support/ResourceSetMessageSource.cs +++ b/src/Spring/Spring.Core/Context/Support/ResourceSetMessageSource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.ComponentModel; using System.Globalization; using System.Resources; @@ -27,8 +21,6 @@ using System.Text; using Spring.Objects.Factory; using Spring.Core.TypeConversion; -#endregion - namespace Spring.Context.Support; /// @@ -44,13 +36,9 @@ namespace Spring.Context.Support; /// Aleksandar Seovic (.NET) public class ResourceSetMessageSource : AbstractMessageSource, IInitializingObject { - #region Fields - private Dictionary _cachedResources; private IList _resourceManagers; - #endregion - /// /// Creates a new instance of the /// class. diff --git a/src/Spring/Spring.Core/Context/Support/StaticApplicationContext.cs b/src/Spring/Spring.Core/Context/Support/StaticApplicationContext.cs index 10f2a75c..be24b50d 100644 --- a/src/Spring/Spring.Core/Context/Support/StaticApplicationContext.cs +++ b/src/Spring/Spring.Core/Context/Support/StaticApplicationContext.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Globalization; using Spring.Objects; using Spring.Objects.Factory.Support; -#endregion - namespace Spring.Context.Support; /// diff --git a/src/Spring/Spring.Core/Context/Support/StaticMessageSource.cs b/src/Spring/Spring.Core/Context/Support/StaticMessageSource.cs index b7b88f6c..43f0954b 100644 --- a/src/Spring/Spring.Core/Context/Support/StaticMessageSource.cs +++ b/src/Spring/Spring.Core/Context/Support/StaticMessageSource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.ComponentModel; using System.Globalization; using System.Text; diff --git a/src/Spring/Spring.Core/Context/Support/TypeAliasesSectionHandler.cs b/src/Spring/Spring.Core/Context/Support/TypeAliasesSectionHandler.cs index 22e035e9..fceca0b0 100644 --- a/src/Spring/Spring.Core/Context/Support/TypeAliasesSectionHandler.cs +++ b/src/Spring/Spring.Core/Context/Support/TypeAliasesSectionHandler.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Configuration; using System.Globalization; using System.Xml; using Spring.Core.TypeResolution; using Spring.Util; -#endregion - namespace Spring.Context.Support; /// diff --git a/src/Spring/Spring.Core/Context/Support/TypeConvertersSectionHandler.cs b/src/Spring/Spring.Core/Context/Support/TypeConvertersSectionHandler.cs index 3d2f979b..8e4343c2 100644 --- a/src/Spring/Spring.Core/Context/Support/TypeConvertersSectionHandler.cs +++ b/src/Spring/Spring.Core/Context/Support/TypeConvertersSectionHandler.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.ComponentModel; using System.Configuration; using System.Globalization; @@ -27,8 +21,6 @@ using System.Xml; using Spring.Core.TypeConversion; using Spring.Util; -#endregion - namespace Spring.Context.Support; /// diff --git a/src/Spring/Spring.Core/Context/Support/XmlApplicationContext.cs b/src/Spring/Spring.Core/Context/Support/XmlApplicationContext.cs index 1b906d4d..bba8554c 100644 --- a/src/Spring/Spring.Core/Context/Support/XmlApplicationContext.cs +++ b/src/Spring/Spring.Core/Context/Support/XmlApplicationContext.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Core.IO; namespace Spring.Context.Support; diff --git a/src/Spring/Spring.Core/Context/Support/XmlApplicationContextArgs.cs b/src/Spring/Spring.Core/Context/Support/XmlApplicationContextArgs.cs index fd2e5e55..88aab7f2 100644 --- a/src/Spring/Spring.Core/Context/Support/XmlApplicationContextArgs.cs +++ b/src/Spring/Spring.Core/Context/Support/XmlApplicationContextArgs.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Core.IO; namespace Spring.Context.Support; diff --git a/src/Spring/Spring.Core/Core/AttributeAccessorSupport.cs b/src/Spring/Spring.Core/Core/AttributeAccessorSupport.cs index 41990d62..f5a76721 100644 --- a/src/Spring/Spring.Core/Core/AttributeAccessorSupport.cs +++ b/src/Spring/Spring.Core/Core/AttributeAccessorSupport.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Diagnostics; namespace Spring.Core; diff --git a/src/Spring/Spring.Core/Core/CannotLoadObjectTypeException.cs b/src/Spring/Spring.Core/Core/CannotLoadObjectTypeException.cs index 0a9e4b91..de3a7138 100644 --- a/src/Spring/Spring.Core/Core/CannotLoadObjectTypeException.cs +++ b/src/Spring/Spring.Core/Core/CannotLoadObjectTypeException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Runtime.Serialization; using System.Security.Permissions; using Spring.Util; -#endregion - namespace Spring.Core; /// @@ -35,8 +27,6 @@ namespace Spring.Core; [Serializable] public class CannotLoadObjectTypeException : FatalReflectionException { - #region Constructor (s) / Destructor - /// /// Initializes a new instance of the class. /// @@ -106,10 +96,6 @@ public class CannotLoadObjectTypeException : FatalReflectionException objectTypeName = info.GetString("ObjectTypeName"); } - #endregion - - #region Properties - /// /// Gets he name of the object we are trying to load. /// @@ -137,10 +123,6 @@ public class CannotLoadObjectTypeException : FatalReflectionException get { return resourceDescription; } } - #endregion - - #region Methods - /// /// Populates a with /// the data needed to serialize the target object. @@ -162,13 +144,7 @@ public class CannotLoadObjectTypeException : FatalReflectionException info.AddValue("ObjectTypeName", ObjectTypeName); } - #endregion - - #region Fields - private string resourceDescription; private string objectName; private string objectTypeName; - - #endregion } diff --git a/src/Spring/Spring.Core/Core/ComposedCriteria.cs b/src/Spring/Spring.Core/Core/ComposedCriteria.cs index 057e61de..0fcb851a 100644 --- a/src/Spring/Spring.Core/Core/ComposedCriteria.cs +++ b/src/Spring/Spring.Core/Core/ComposedCriteria.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Core; /// @@ -30,8 +22,6 @@ namespace Spring.Core; /// public class ComposedCriteria : ICriteria { - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// class. @@ -53,10 +43,6 @@ public class ComposedCriteria : ICriteria Add(criteria); } - #endregion - - #region Methods - /// /// Does the supplied satisfy the criteria encapsulated by /// this instance? @@ -94,8 +80,6 @@ public class ComposedCriteria : ICriteria } } - #endregion - /// /// The list of composing this /// instance. @@ -105,9 +89,5 @@ public class ComposedCriteria : ICriteria get { return _criteria; } } - #region Fields - private IList _criteria; - - #endregion } \ No newline at end of file diff --git a/src/Spring/Spring.Core/Core/ControlFlowFactory.cs b/src/Spring/Spring.Core/Core/ControlFlowFactory.cs index ad842b0d..8c254b37 100644 --- a/src/Spring/Spring.Core/Core/ControlFlowFactory.cs +++ b/src/Spring/Spring.Core/Core/ControlFlowFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Diagnostics; using System.Reflection; -#endregion - namespace Spring.Core; /// @@ -51,8 +43,6 @@ public abstract class ControlFlowFactory { private StackTrace _stackTrace; - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// class. @@ -62,10 +52,6 @@ public abstract class ControlFlowFactory _stackTrace = new StackTrace(); } - #endregion - - #region IControlFlow Members - /// /// Detects whether the caller is under the supplied , /// according to the current stacktrace. @@ -144,7 +130,5 @@ public abstract class ControlFlowFactory private Type _typeToMatch; } - - #endregion } } diff --git a/src/Spring/Spring.Core/Core/Conventions.cs b/src/Spring/Spring.Core/Core/Conventions.cs index 35b836fc..24f32d06 100644 --- a/src/Spring/Spring.Core/Core/Conventions.cs +++ b/src/Spring/Spring.Core/Core/Conventions.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Util; namespace Spring.Core; diff --git a/src/Spring/Spring.Core/Core/IAttributeAccessor.cs b/src/Spring/Spring.Core/Core/IAttributeAccessor.cs index 0246b1b9..0d3c1246 100644 --- a/src/Spring/Spring.Core/Core/IAttributeAccessor.cs +++ b/src/Spring/Spring.Core/Core/IAttributeAccessor.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Core; /// diff --git a/src/Spring/Spring.Core/Core/IControlFlow.cs b/src/Spring/Spring.Core/Core/IControlFlow.cs index b9b90ac4..60e43674 100644 --- a/src/Spring/Spring.Core/Core/IControlFlow.cs +++ b/src/Spring/Spring.Core/Core/IControlFlow.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Core; /// diff --git a/src/Spring/Spring.Core/Core/ICriteria.cs b/src/Spring/Spring.Core/Core/ICriteria.cs index 482d6bec..04ae72e2 100644 --- a/src/Spring/Spring.Core/Core/ICriteria.cs +++ b/src/Spring/Spring.Core/Core/ICriteria.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Core; /// diff --git a/src/Spring/Spring.Core/Core/IErrorCoded.cs b/src/Spring/Spring.Core/Core/IErrorCoded.cs index e509fceb..1bfddbcb 100644 --- a/src/Spring/Spring.Core/Core/IErrorCoded.cs +++ b/src/Spring/Spring.Core/Core/IErrorCoded.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Core; /// diff --git a/src/Spring/Spring.Core/Core/IO/AbstractResource.cs b/src/Spring/Spring.Core/Core/IO/AbstractResource.cs index ffa5cc95..91364e22 100644 --- a/src/Spring/Spring.Core/Core/IO/AbstractResource.cs +++ b/src/Spring/Spring.Core/Core/IO/AbstractResource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Text; using Spring.Util; -#endregion - namespace Spring.Core.IO; /// @@ -72,8 +64,6 @@ public abstract class AbstractResource : IResource private string resourceName; private string basePathPlaceHolder = DefaultBasePathPlaceHolder; - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// class. @@ -112,10 +102,6 @@ public abstract class AbstractResource : IResource this.resourceName = resourceName; } - #endregion - - #region Properties - /// /// The special character that denotes the base (home, or root) /// path. @@ -283,10 +269,6 @@ public abstract class AbstractResource : IResource } } - #endregion - - #region Methods - /// /// Strips any protocol name from the supplied /// . @@ -410,10 +392,6 @@ public abstract class AbstractResource : IResource return Description.GetHashCode(); } - #endregion - - #region Relative Resource Support - /// /// Factory Method. Create a new instance of the current resource type using the given resourceName /// @@ -751,6 +729,4 @@ public abstract class AbstractResource : IResource return count; } - - #endregion } diff --git a/src/Spring/Spring.Core/Core/IO/AssemblyResource.cs b/src/Spring/Spring.Core/Core/IO/AssemblyResource.cs index ac11dc36..6e9f7d8c 100644 --- a/src/Spring/Spring.Core/Core/IO/AssemblyResource.cs +++ b/src/Spring/Spring.Core/Core/IO/AssemblyResource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Globalization; using System.Reflection; using Microsoft.Extensions.Logging; -#endregion - namespace Spring.Core.IO; /// @@ -45,8 +37,6 @@ namespace Spring.Core.IO; /// Federico Spinazzi (.NET) public class AssemblyResource : AbstractResource { - #region Fields - private Assembly _assembly; private string[] _resources; private string _resourceName; @@ -55,10 +45,6 @@ public class AssemblyResource : AbstractResource private string _resourceAssemblyName; private static readonly ILogger log = LogManager.GetLogger(); - #endregion - - #region Constructors - /// /// Creates a new instance of the /// class. @@ -106,10 +92,6 @@ public class AssemblyResource : AbstractResource this._resourceName = String.Format("{0}.{1}", info[1], info[2]); } - #endregion - - #region Properties - /// /// Return an for this resource. /// @@ -257,8 +239,6 @@ public class AssemblyResource : AbstractResource } } - #endregion - /// /// Does the supplied relative ? /// diff --git a/src/Spring/Spring.Core/Core/IO/ConfigSectionResource.cs b/src/Spring/Spring.Core/Core/IO/ConfigSectionResource.cs index 16b21a5c..6005e773 100644 --- a/src/Spring/Spring.Core/Core/IO/ConfigSectionResource.cs +++ b/src/Spring/Spring.Core/Core/IO/ConfigSectionResource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Text; using System.Xml; using Spring.Util; -#endregion - namespace Spring.Core.IO; /// @@ -49,8 +41,6 @@ public class ConfigSectionResource : AbstractResource private XmlElement configElement; private string sectionName; - #region Constructor (s) / Destructor - /// /// Creates new instance of the /// class. @@ -86,10 +76,6 @@ public class ConfigSectionResource : AbstractResource configElement = (XmlElement) ConfigurationUtils.GetSection(sectionName); } - #endregion - - #region IResource Members - /// /// Returns the handle for this resource. /// @@ -158,10 +144,6 @@ public class ConfigSectionResource : AbstractResource get { return false; } } - #endregion - - #region IInputStreamSource Members - /// /// Return an for this resource. /// @@ -185,10 +167,6 @@ public class ConfigSectionResource : AbstractResource } } - #endregion - - #region Properties - /// /// Exposes the actual for the /// configuration section. @@ -202,6 +180,4 @@ public class ConfigSectionResource : AbstractResource { get { return configElement; } } - - #endregion } diff --git a/src/Spring/Spring.Core/Core/IO/ConfigurableResourceLoader.cs b/src/Spring/Spring.Core/Core/IO/ConfigurableResourceLoader.cs index d2aaa37d..8b17518b 100644 --- a/src/Spring/Spring.Core/Core/IO/ConfigurableResourceLoader.cs +++ b/src/Spring/Spring.Core/Core/IO/ConfigurableResourceLoader.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Util; using Spring.Reflection.Dynamic; -#endregion - namespace Spring.Core.IO; /// @@ -188,9 +180,5 @@ public class ConfigurableResourceLoader : IResourceLoader return pos == -1 ? null : resourceName.Substring(0, pos); } - #region Fields - private string defaultProtocol = "file"; - - #endregion } diff --git a/src/Spring/Spring.Core/Core/IO/EncodedResource.cs b/src/Spring/Spring.Core/Core/IO/EncodedResource.cs index 0b827dbe..d223fd19 100644 --- a/src/Spring/Spring.Core/Core/IO/EncodedResource.cs +++ b/src/Spring/Spring.Core/Core/IO/EncodedResource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Text; using Spring.Util; diff --git a/src/Spring/Spring.Core/Core/IO/FileSystemResource.cs b/src/Spring/Spring.Core/Core/IO/FileSystemResource.cs index 19584dad..9ffbe55f 100644 --- a/src/Spring/Spring.Core/Core/IO/FileSystemResource.cs +++ b/src/Spring/Spring.Core/Core/IO/FileSystemResource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Globalization; using Spring.Util; -#endregion - namespace Spring.Core.IO; /// @@ -70,8 +62,6 @@ public class FileSystemResource : AbstractResource private string rootLocation; private string resourcePath; - #region Constructors - /// /// Creates a new instance of the /// class. @@ -119,10 +109,6 @@ public class FileSystemResource : AbstractResource } } - #endregion - - #region Properties - /// /// Returns the underlying handle for /// this resource. @@ -265,8 +251,6 @@ public class FileSystemResource : AbstractResource get { return new UriBuilder("file", null, 0, fileHandle.FullName).Uri; } } - #endregion - /// /// Initializes this instance. /// diff --git a/src/Spring/Spring.Core/Core/IO/IInputStreamSource.cs b/src/Spring/Spring.Core/Core/IO/IInputStreamSource.cs index 2a397a33..756696ab 100644 --- a/src/Spring/Spring.Core/Core/IO/IInputStreamSource.cs +++ b/src/Spring/Spring.Core/Core/IO/IInputStreamSource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Core.IO; /// diff --git a/src/Spring/Spring.Core/Core/IO/IResource.cs b/src/Spring/Spring.Core/Core/IO/IResource.cs index 2e84410a..e694f915 100644 --- a/src/Spring/Spring.Core/Core/IO/IResource.cs +++ b/src/Spring/Spring.Core/Core/IO/IResource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.ComponentModel; -#endregion - namespace Spring.Core.IO; /// diff --git a/src/Spring/Spring.Core/Core/IO/IResourceLoader.cs b/src/Spring/Spring.Core/Core/IO/IResourceLoader.cs index ed9e058a..f151d519 100644 --- a/src/Spring/Spring.Core/Core/IO/IResourceLoader.cs +++ b/src/Spring/Spring.Core/Core/IO/IResourceLoader.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Core.IO; /// diff --git a/src/Spring/Spring.Core/Core/IO/InputStreamResource.cs b/src/Spring/Spring.Core/Core/IO/InputStreamResource.cs index 63cf9ad9..497d25f0 100644 --- a/src/Spring/Spring.Core/Core/IO/InputStreamResource.cs +++ b/src/Spring/Spring.Core/Core/IO/InputStreamResource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Util; -#endregion - namespace Spring.Core.IO; /// @@ -48,8 +40,6 @@ namespace Spring.Core.IO; /// Rick Evans (.NET) public class InputStreamResource : AbstractResource { - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// class. @@ -72,10 +62,6 @@ public class InputStreamResource : AbstractResource _description = description == null ? string.Empty : description; } - #endregion - - #region Properties - /// /// The input to use. /// @@ -129,12 +115,6 @@ public class InputStreamResource : AbstractResource get { return true; } } - #endregion - - #region Fields - private Stream _inputStream; private string _description; - - #endregion } diff --git a/src/Spring/Spring.Core/Core/IO/ResourceConverter.cs b/src/Spring/Spring.Core/Core/IO/ResourceConverter.cs index 4669daea..dba88fbd 100644 --- a/src/Spring/Spring.Core/Core/IO/ResourceConverter.cs +++ b/src/Spring/Spring.Core/Core/IO/ResourceConverter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.ComponentModel; using System.Globalization; using Microsoft.Extensions.Logging; using Spring.Util; -#endregion - namespace Spring.Core.IO; /// @@ -67,8 +59,6 @@ public class ResourceConverter : TypeConverter private static readonly ILogger _log = LogManager.GetLogger(); private IResourceLoader _resourceLoader; - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// class. @@ -89,8 +79,6 @@ public class ResourceConverter : TypeConverter _resourceLoader = resourceLoader; } - #endregion - /// /// Returns whether this converter can convert an object of one /// to a @@ -183,8 +171,6 @@ public class ResourceConverter : TypeConverter } else { - #region Instrumentation - if (_log.IsEnabled(LogLevel.Warning)) { _log.LogWarning(string.Format( @@ -192,8 +178,6 @@ public class ResourceConverter : TypeConverter "Could not resolve placeholder '{0}' in resource path " + "'{1}' as an environment variable.", expression, path)); } - - #endregion } } diff --git a/src/Spring/Spring.Core/Core/IO/ResourceHandlerRegistry.cs b/src/Spring/Spring.Core/Core/IO/ResourceHandlerRegistry.cs index e5e5b372..424b5fbd 100644 --- a/src/Spring/Spring.Core/Core/IO/ResourceHandlerRegistry.cs +++ b/src/Spring/Spring.Core/Core/IO/ResourceHandlerRegistry.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using Spring.Context.Support; using Spring.Core.TypeResolution; @@ -228,8 +224,6 @@ public class ResourceHandlerRegistry /// public static void RegisterResourceHandler(string protocolName, Type handlerType) { - #region Sanity Checks - AssertUtils.ArgumentHasText(protocolName, "protocolName"); AssertUtils.ArgumentNotNull(handlerType, "handlerType"); if (!typeof(IResource).IsAssignableFrom(handlerType)) @@ -238,8 +232,6 @@ public class ResourceHandlerRegistry string.Format("[{0}] does not implement [{1}] interface (it must).", handlerType.FullName, typeof(IResource).FullName)); } - #endregion - lock (syncRoot) { Action callback = () => diff --git a/src/Spring/Spring.Core/Core/IO/StringResource.cs b/src/Spring/Spring.Core/Core/IO/StringResource.cs index 1d075122..99ba668a 100644 --- a/src/Spring/Spring.Core/Core/IO/StringResource.cs +++ b/src/Spring/Spring.Core/Core/IO/StringResource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Text; using Spring.Util; -#endregion - namespace Spring.Core.IO; /// @@ -33,14 +25,10 @@ namespace Spring.Core.IO; /// Erich Eichinger public class StringResource : AbstractResource { - #region Fields - private readonly string _description; private readonly string _content; private readonly Encoding _encoding; - #endregion - /// /// Creates a new instance of the class. /// diff --git a/src/Spring/Spring.Core/Core/IO/UrlResource.cs b/src/Spring/Spring.Core/Core/IO/UrlResource.cs index b02b284a..2a418fe9 100644 --- a/src/Spring/Spring.Core/Core/IO/UrlResource.cs +++ b/src/Spring/Spring.Core/Core/IO/UrlResource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Net; using Spring.Util; -#endregion - namespace Spring.Core.IO; /// diff --git a/src/Spring/Spring.Core/Core/IOrdered.cs b/src/Spring/Spring.Core/Core/IOrdered.cs index 8466b3aa..900fdaa9 100644 --- a/src/Spring/Spring.Core/Core/IOrdered.cs +++ b/src/Spring/Spring.Core/Core/IOrdered.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Core; /// diff --git a/src/Spring/Spring.Core/Core/IPriorityOrdered.cs b/src/Spring/Spring.Core/Core/IPriorityOrdered.cs index 06d29313..9bbc79ea 100644 --- a/src/Spring/Spring.Core/Core/IPriorityOrdered.cs +++ b/src/Spring/Spring.Core/Core/IPriorityOrdered.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Context; using Spring.Objects.Factory.Config; diff --git a/src/Spring/Spring.Core/Core/MethodArgumentsCriteria.cs b/src/Spring/Spring.Core/Core/MethodArgumentsCriteria.cs index ad99c64f..172a243a 100644 --- a/src/Spring/Spring.Core/Core/MethodArgumentsCriteria.cs +++ b/src/Spring/Spring.Core/Core/MethodArgumentsCriteria.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using Spring.Util; -#endregion - namespace Spring.Core; /// @@ -44,8 +36,6 @@ namespace Spring.Core; /// Bruno Baia public class MethodArgumentsCriteria : ICriteria { - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// class. @@ -73,10 +63,6 @@ public class MethodArgumentsCriteria : ICriteria _parameters = ReflectionUtils.GetTypes(arguments); } - #endregion - - #region Methods - /// /// Does the supplied satisfy the criteria encapsulated by /// this instance? @@ -169,11 +155,5 @@ public class MethodArgumentsCriteria : ICriteria return satisfied; } - #endregion - - #region Fields - private readonly Type[] _parameters; - - #endregion } diff --git a/src/Spring/Spring.Core/Core/MethodGenericArgumentsCountCriteria.cs b/src/Spring/Spring.Core/Core/MethodGenericArgumentsCountCriteria.cs index ce548667..1bf3f829 100644 --- a/src/Spring/Spring.Core/Core/MethodGenericArgumentsCountCriteria.cs +++ b/src/Spring/Spring.Core/Core/MethodGenericArgumentsCountCriteria.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; -#endregion - namespace Spring.Core; /// @@ -39,8 +31,6 @@ namespace Spring.Core; /// Bruno Baia public class MethodGenericArgumentsCountCriteria : ICriteria { - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// class. @@ -73,10 +63,6 @@ public class MethodGenericArgumentsCountCriteria : ICriteria ExpectedGenericArgumentCount = expectedGenericArgumentCount; } - #endregion - - #region Properties - /// /// The number of generic arguments that a /// must have to satisfy this criteria. @@ -99,10 +85,6 @@ public class MethodGenericArgumentsCountCriteria : ICriteria } } - #endregion - - #region Methods - /// /// Does the supplied satisfy the criteria encapsulated by /// this instance? @@ -124,11 +106,5 @@ public class MethodGenericArgumentsCountCriteria : ICriteria return satisfied; } - #endregion - - #region Fields - private int _count; - - #endregion } \ No newline at end of file diff --git a/src/Spring/Spring.Core/Core/MethodInvocationException.cs b/src/Spring/Spring.Core/Core/MethodInvocationException.cs index 59ce0bfc..fd31067e 100644 --- a/src/Spring/Spring.Core/Core/MethodInvocationException.cs +++ b/src/Spring/Spring.Core/Core/MethodInvocationException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Runtime.Serialization; -#endregion - namespace Spring.Core; /// @@ -46,8 +38,6 @@ public class MethodInvocationException : PropertyAccessException } } - #region Constructor (s) / Destructor - /// /// Creates a new instance of the MethodInvocationException class. /// @@ -112,6 +102,4 @@ public class MethodInvocationException : PropertyAccessException : base(info, context) { } - - #endregion } diff --git a/src/Spring/Spring.Core/Core/MethodNameMatchCriteria.cs b/src/Spring/Spring.Core/Core/MethodNameMatchCriteria.cs index db1f87c8..d5107d17 100644 --- a/src/Spring/Spring.Core/Core/MethodNameMatchCriteria.cs +++ b/src/Spring/Spring.Core/Core/MethodNameMatchCriteria.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using Spring.Util; -#endregion - namespace Spring.Core; /// @@ -41,8 +33,6 @@ namespace Spring.Core; /// Bruno Baia public class MethodNameMatchCriteria : ICriteria { - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// class. @@ -72,10 +62,6 @@ public class MethodNameMatchCriteria : ICriteria Pattern = pattern; } - #endregion - - #region Properties - /// /// The number of parameters that a /// must have to satisfy this criteria. @@ -93,10 +79,6 @@ public class MethodNameMatchCriteria : ICriteria } } - #endregion - - #region Methods - /// /// Does the supplied satisfy the criteria encapsulated by /// this instance? @@ -118,11 +100,5 @@ public class MethodNameMatchCriteria : ICriteria return satisfied; } - #endregion - - #region Fields - private string pattern; - - #endregion } diff --git a/src/Spring/Spring.Core/Core/MethodParameter.cs b/src/Spring/Spring.Core/Core/MethodParameter.cs index 3f1d9505..4ac99ab5 100644 --- a/src/Spring/Spring.Core/Core/MethodParameter.cs +++ b/src/Spring/Spring.Core/Core/MethodParameter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using Spring.Util; diff --git a/src/Spring/Spring.Core/Core/MethodParametersCountCriteria.cs b/src/Spring/Spring.Core/Core/MethodParametersCountCriteria.cs index f6640442..0e18e071 100644 --- a/src/Spring/Spring.Core/Core/MethodParametersCountCriteria.cs +++ b/src/Spring/Spring.Core/Core/MethodParametersCountCriteria.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; -#endregion - namespace Spring.Core; /// @@ -42,8 +34,6 @@ namespace Spring.Core; /// Rick Evans public class MethodParametersCountCriteria : ICriteria { - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// class. @@ -76,10 +66,6 @@ public class MethodParametersCountCriteria : ICriteria ExpectedParameterCount = expectedParameterCount; } - #endregion - - #region Properties - /// /// The number of parameters that a /// must have to satisfy this criteria. @@ -102,10 +88,6 @@ public class MethodParametersCountCriteria : ICriteria } } - #endregion - - #region Methods - /// /// Does the supplied satisfy the criteria encapsulated by /// this instance? @@ -136,11 +118,5 @@ public class MethodParametersCountCriteria : ICriteria return satisfied; } - #endregion - - #region Fields - private int _count; - - #endregion } diff --git a/src/Spring/Spring.Core/Core/MethodParametersCriteria.cs b/src/Spring/Spring.Core/Core/MethodParametersCriteria.cs index f5e18ba6..fba76c23 100644 --- a/src/Spring/Spring.Core/Core/MethodParametersCriteria.cs +++ b/src/Spring/Spring.Core/Core/MethodParametersCriteria.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; -#endregion - namespace Spring.Core; /// @@ -44,8 +36,6 @@ namespace Spring.Core; /// Bruno Baia public class MethodParametersCriteria : ICriteria { - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// class. @@ -73,10 +63,6 @@ public class MethodParametersCriteria : ICriteria _parameters = parameters; } - #endregion - - #region Methods - /// /// Does the supplied satisfy the criteria encapsulated by /// this instance? @@ -115,11 +101,5 @@ public class MethodParametersCriteria : ICriteria return satisfied; } - #endregion - - #region Fields - private readonly Type[] _parameters; - - #endregion } diff --git a/src/Spring/Spring.Core/Core/MethodReturnTypeCriteria.cs b/src/Spring/Spring.Core/Core/MethodReturnTypeCriteria.cs index 7d96f389..ac02ee68 100644 --- a/src/Spring/Spring.Core/Core/MethodReturnTypeCriteria.cs +++ b/src/Spring/Spring.Core/Core/MethodReturnTypeCriteria.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; -#endregion - namespace Spring.Core; /// @@ -33,18 +25,12 @@ namespace Spring.Core; /// Rick Evans public class MethodReturnTypeCriteria : ICriteria { - #region Constants - /// /// The return to match against if no /// is provided explictly. /// private static readonly Type DefaultType = typeof(void); - #endregion - - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// class. @@ -68,10 +54,6 @@ public class MethodReturnTypeCriteria : ICriteria ReturnType = type; } - #endregion - - #region Properties - /// /// The that the return type of a given /// must match in order to satisfy @@ -83,10 +65,6 @@ public class MethodReturnTypeCriteria : ICriteria set { _type = value == null ? DefaultType : value; } } - #endregion - - #region Methods - /// /// Does the supplied satisfy the criteria encapsulated by /// this instance? @@ -108,11 +86,5 @@ public class MethodReturnTypeCriteria : ICriteria return satisfied; } - #endregion - - #region Fields - private Type _type; - - #endregion } diff --git a/src/Spring/Spring.Core/Core/NotReadablePropertyException.cs b/src/Spring/Spring.Core/Core/NotReadablePropertyException.cs index 001b6366..3c389043 100644 --- a/src/Spring/Spring.Core/Core/NotReadablePropertyException.cs +++ b/src/Spring/Spring.Core/Core/NotReadablePropertyException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Globalization; using System.Runtime.Serialization; -#endregion - namespace Spring.Core; /// diff --git a/src/Spring/Spring.Core/Core/NotWritablePropertyException.cs b/src/Spring/Spring.Core/Core/NotWritablePropertyException.cs index 7900c7c3..5fd57de5 100644 --- a/src/Spring/Spring.Core/Core/NotWritablePropertyException.cs +++ b/src/Spring/Spring.Core/Core/NotWritablePropertyException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Globalization; using System.Runtime.Serialization; -#endregion - namespace Spring.Core; /// diff --git a/src/Spring/Spring.Core/Core/NullValueInNestedPathException.cs b/src/Spring/Spring.Core/Core/NullValueInNestedPathException.cs index 5a7afda5..944b34cf 100644 --- a/src/Spring/Spring.Core/Core/NullValueInNestedPathException.cs +++ b/src/Spring/Spring.Core/Core/NullValueInNestedPathException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Globalization; using System.Runtime.Serialization; using System.Security.Permissions; using Spring.Util; -#endregion - namespace Spring.Core; /// @@ -55,8 +47,6 @@ public class NullValueInNestedPathException : FatalReflectionException get { return type; } } - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// class. @@ -140,10 +130,6 @@ public class NullValueInNestedPathException : FatalReflectionException property = info.GetString("PropertyName"); } - #endregion - - #region Methods - /// /// Populates a with /// the data needed to serialize the target object. @@ -164,6 +150,4 @@ public class NullValueInNestedPathException : FatalReflectionException info.AddValue("ObjectType", ObjectType); info.AddValue("PropertyName", PropertyName); } - - #endregion } diff --git a/src/Spring/Spring.Core/Core/OrderComparator.cs b/src/Spring/Spring.Core/Core/OrderComparator.cs index 03044297..a8e2fc3b 100644 --- a/src/Spring/Spring.Core/Core/OrderComparator.cs +++ b/src/Spring/Spring.Core/Core/OrderComparator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; -#endregion - namespace Spring.Core; /// diff --git a/src/Spring/Spring.Core/Core/PropertyAccessException.cs b/src/Spring/Spring.Core/Core/PropertyAccessException.cs index 6c9b2035..8ff786b8 100644 --- a/src/Spring/Spring.Core/Core/PropertyAccessException.cs +++ b/src/Spring/Spring.Core/Core/PropertyAccessException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Runtime.Serialization; using System.Security.Permissions; using Spring.Util; -#endregion - namespace Spring.Core; /// @@ -52,8 +44,6 @@ public abstract class PropertyAccessException : ReflectionException, IErrorCoded private PropertyChangeEventArgs _propertyChangeEventArgs; - #region Methods - /// /// Populates a with /// the data needed to serialize the target object. @@ -74,8 +64,6 @@ public abstract class PropertyAccessException : ReflectionException, IErrorCoded info.AddValue("PropertyChangeArgs", PropertyChangeArgs); } - #endregion - /// /// Create a new instance of the PropertyAccessException class. /// diff --git a/src/Spring/Spring.Core/Core/PropertyChangeEventArgs.cs b/src/Spring/Spring.Core/Core/PropertyChangeEventArgs.cs index d0109605..79c830ce 100644 --- a/src/Spring/Spring.Core/Core/PropertyChangeEventArgs.cs +++ b/src/Spring/Spring.Core/Core/PropertyChangeEventArgs.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.ComponentModel; -#endregion - namespace Spring.Core; /// diff --git a/src/Spring/Spring.Core/Core/RegularExpressionCriteria.cs b/src/Spring/Spring.Core/Core/RegularExpressionCriteria.cs index 057ca347..2825d2d9 100644 --- a/src/Spring/Spring.Core/Core/RegularExpressionCriteria.cs +++ b/src/Spring/Spring.Core/Core/RegularExpressionCriteria.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Text.RegularExpressions; using Spring.Util; -#endregion - namespace Spring.Core; /// @@ -34,17 +26,11 @@ namespace Spring.Core; /// Rick Evans public abstract class RegularExpressionCriteria : ICriteria { - #region Constants - /// /// The default pattern... matches absolutely anything. /// protected const string MatchAnyThingPattern = ".*"; - #endregion - - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// class. @@ -65,10 +51,6 @@ public abstract class RegularExpressionCriteria : ICriteria Pattern = pattern; } - #endregion - - #region Properties - /// /// The regular expression pattern to be applied. /// @@ -100,10 +82,6 @@ public abstract class RegularExpressionCriteria : ICriteria set { _expression = value; } } - #endregion - - #region Methods - /// /// Does the supplied satisfy the criteria encapsulated by /// this instance? @@ -127,13 +105,7 @@ public abstract class RegularExpressionCriteria : ICriteria return Expression.IsMatch(input); } - #endregion - - #region Fields - private string _pattern; private RegexOptions _options; private Regex _expression; - - #endregion } diff --git a/src/Spring/Spring.Core/Core/RegularExpressionEventNameCriteria.cs b/src/Spring/Spring.Core/Core/RegularExpressionEventNameCriteria.cs index f3fd37bc..df874534 100644 --- a/src/Spring/Spring.Core/Core/RegularExpressionEventNameCriteria.cs +++ b/src/Spring/Spring.Core/Core/RegularExpressionEventNameCriteria.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using System.Text.RegularExpressions; using Spring.Util; -#endregion - namespace Spring.Core; /// @@ -36,17 +28,11 @@ namespace Spring.Core; /// Rick Evans public class RegularExpressionEventNameCriteria : RegularExpressionCriteria { - #region Constants - /// /// The default event name pattern... matches pretty much any event name. /// private const string MatchAnyEventNamePattern = ".+"; - #endregion - - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// class. @@ -71,10 +57,6 @@ public class RegularExpressionEventNameCriteria : RegularExpressionCriteria Pattern = StringUtils.HasText(eventNamePattern) ? eventNamePattern : RegularExpressionEventNameCriteria.MatchAnyEventNamePattern; } - #endregion - - #region Methods - /// /// Does the supplied satisfy the criteria encapsulated by /// this instance? @@ -95,6 +77,4 @@ public class RegularExpressionEventNameCriteria : RegularExpressionCriteria return satisfied; } - - #endregion } \ No newline at end of file diff --git a/src/Spring/Spring.Core/Core/RegularExpressionMethodNameCriteria.cs b/src/Spring/Spring.Core/Core/RegularExpressionMethodNameCriteria.cs index 294279da..a9dfb6ea 100644 --- a/src/Spring/Spring.Core/Core/RegularExpressionMethodNameCriteria.cs +++ b/src/Spring/Spring.Core/Core/RegularExpressionMethodNameCriteria.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using System.Text.RegularExpressions; using Spring.Util; -#endregion - namespace Spring.Core; /// @@ -36,17 +28,11 @@ namespace Spring.Core; /// Rick Evans public class RegularExpressionMethodNameCriteria : RegularExpressionCriteria { - #region Constants - /// /// The default method name pattern... matches pretty much any method name. /// private const string MatchAnyMethodNamePattern = ".+"; - #endregion - - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// class. @@ -71,10 +57,6 @@ public class RegularExpressionMethodNameCriteria : RegularExpressionCriteria Pattern = StringUtils.HasText(methodNamePattern) ? methodNamePattern : RegularExpressionMethodNameCriteria.MatchAnyMethodNamePattern; } - #endregion - - #region Methods - /// /// Does the supplied satisfy the criteria encapsulated by /// this instance? @@ -95,6 +77,4 @@ public class RegularExpressionMethodNameCriteria : RegularExpressionCriteria return satisfied; } - - #endregion } diff --git a/src/Spring/Spring.Core/Core/TypeConversion/CredentialConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/CredentialConverter.cs index 07b28a3e..7966833e 100644 --- a/src/Spring/Spring.Core/Core/TypeConversion/CredentialConverter.cs +++ b/src/Spring/Spring.Core/Core/TypeConversion/CredentialConverter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Net; using System.ComponentModel; using System.Globalization; using System.Text.RegularExpressions; -#endregion - namespace Spring.Core.TypeConversion; /// diff --git a/src/Spring/Spring.Core/Core/TypeConversion/CustomNumberConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/CustomNumberConverter.cs index 6ae02b57..ab79ab1a 100644 --- a/src/Spring/Spring.Core/Core/TypeConversion/CustomNumberConverter.cs +++ b/src/Spring/Spring.Core/Core/TypeConversion/CustomNumberConverter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.ComponentModel; using System.Globalization; using Spring.Util; -#endregion - namespace Spring.Core.TypeConversion; /// diff --git a/src/Spring/Spring.Core/Core/TypeConversion/FileInfoConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/FileInfoConverter.cs index aa351af0..efd7f408 100644 --- a/src/Spring/Spring.Core/Core/TypeConversion/FileInfoConverter.cs +++ b/src/Spring/Spring.Core/Core/TypeConversion/FileInfoConverter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.ComponentModel; using System.Globalization; -#endregion - namespace Spring.Core.TypeConversion; /// @@ -34,18 +26,12 @@ namespace Spring.Core.TypeConversion; /// Mark Pollack (.NET) public class FileInfoConverter : TypeConverter { - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// class. /// public FileInfoConverter() { } - #endregion - - #region Methods - /// /// Returns whether this converter can convert an object of one /// to a @@ -105,6 +91,4 @@ public class FileInfoConverter : TypeConverter return base.ConvertFrom(context, culture, value); } - - #endregion } diff --git a/src/Spring/Spring.Core/Core/TypeConversion/NameValueConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/NameValueConverter.cs index db6ce18d..45fdeb4b 100644 --- a/src/Spring/Spring.Core/Core/TypeConversion/NameValueConverter.cs +++ b/src/Spring/Spring.Core/Core/TypeConversion/NameValueConverter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.ComponentModel; using System.Configuration; using System.Globalization; using System.Xml; -#endregion - namespace Spring.Core.TypeConversion; /// @@ -77,8 +69,6 @@ namespace Spring.Core.TypeConversion; /// Simon White (.NET) public class NameValueConverter : TypeConverter { - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// class. @@ -87,8 +77,6 @@ public class NameValueConverter : TypeConverter { } - #endregion - /// /// Returns whether this converter can convert an object of one /// to a diff --git a/src/Spring/Spring.Core/Core/TypeConversion/RGBColorConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/RGBColorConverter.cs index 6b9e4d72..08e32436 100644 --- a/src/Spring/Spring.Core/Core/TypeConversion/RGBColorConverter.cs +++ b/src/Spring/Spring.Core/Core/TypeConversion/RGBColorConverter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.ComponentModel; using System.Drawing; using System.Globalization; using Spring.Util; -#endregion - namespace Spring.Core.TypeConversion; /// diff --git a/src/Spring/Spring.Core/Core/TypeConversion/RegexConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/RegexConverter.cs index df45e4ce..a4ffbc65 100644 --- a/src/Spring/Spring.Core/Core/TypeConversion/RegexConverter.cs +++ b/src/Spring/Spring.Core/Core/TypeConversion/RegexConverter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.ComponentModel; using System.Globalization; using System.Text.RegularExpressions; -#endregion - namespace Spring.Core.TypeConversion; /// diff --git a/src/Spring/Spring.Core/Core/TypeConversion/RegistryKeyConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/RegistryKeyConverter.cs index ee6fa9b9..a137f62f 100644 --- a/src/Spring/Spring.Core/Core/TypeConversion/RegistryKeyConverter.cs +++ b/src/Spring/Spring.Core/Core/TypeConversion/RegistryKeyConverter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.ComponentModel; using System.Globalization; using Microsoft.Win32; using Spring.Util; -#endregion - namespace Spring.Core.TypeConversion; /// diff --git a/src/Spring/Spring.Core/Core/TypeConversion/ResourceManagerConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/ResourceManagerConverter.cs index 46de20f7..1888a92a 100644 --- a/src/Spring/Spring.Core/Core/TypeConversion/ResourceManagerConverter.cs +++ b/src/Spring/Spring.Core/Core/TypeConversion/ResourceManagerConverter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.ComponentModel; using System.Globalization; using System.Reflection; @@ -27,8 +21,6 @@ using System.Resources; using Spring.Core.TypeResolution; using Spring.Util; -#endregion - namespace Spring.Core.TypeConversion; /// @@ -42,8 +34,6 @@ public class ResourceManagerConverter : TypeConverter /// public static readonly string APP_GLOBALRESOURCES_ASSEMBLYNAME = "App_GlobalResources"; - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// class. @@ -52,10 +42,6 @@ public class ResourceManagerConverter : TypeConverter { } - #endregion - - #region Methods - /// /// Returns whether this converter can convert an object of one /// to a @@ -159,6 +145,4 @@ public class ResourceManagerConverter : TypeConverter return base.ConvertFrom(context, culture, value); } - - #endregion } \ No newline at end of file diff --git a/src/Spring/Spring.Core/Core/TypeConversion/RuntimeTypeConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/RuntimeTypeConverter.cs index 2d1134c0..800c8d4b 100644 --- a/src/Spring/Spring.Core/Core/TypeConversion/RuntimeTypeConverter.cs +++ b/src/Spring/Spring.Core/Core/TypeConversion/RuntimeTypeConverter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.ComponentModel; using System.Globalization; using Spring.Core.TypeResolution; -#endregion - namespace Spring.Core.TypeConversion; /// @@ -41,18 +33,12 @@ namespace Spring.Core.TypeConversion; /// Rick Evans (.NET) public class RuntimeTypeConverter : TypeConverter { - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// class. /// public RuntimeTypeConverter() { } - #endregion - - #region Methods - /// /// Returns whether this converter can convert an object of one /// to the @@ -172,6 +158,4 @@ public class RuntimeTypeConverter : TypeConverter return base.ConvertTo(context, culture, value, destinationType); } - - #endregion } diff --git a/src/Spring/Spring.Core/Core/TypeConversion/StreamConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/StreamConverter.cs index 37948e65..42577b84 100644 --- a/src/Spring/Spring.Core/Core/TypeConversion/StreamConverter.cs +++ b/src/Spring/Spring.Core/Core/TypeConversion/StreamConverter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.ComponentModel; using System.Globalization; using Spring.Core.IO; -#endregion - namespace Spring.Core.TypeConversion; /// @@ -38,8 +30,6 @@ public class StreamConverter : TypeConverter { private ResourceConverter resourceConverter; - #region Constructors - /// /// Create a new StreamConverter using the default /// . @@ -61,10 +51,6 @@ public class StreamConverter : TypeConverter : resourceConverter; } - #endregion - - #region Methods - /// /// Returns whether this converter can convert an object of one /// to a @@ -125,6 +111,4 @@ public class StreamConverter : TypeConverter return base.ConvertFrom(context, culture, val); } - - #endregion } \ No newline at end of file diff --git a/src/Spring/Spring.Core/Core/TypeConversion/StringArrayConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/StringArrayConverter.cs index 139e1225..b7554b93 100644 --- a/src/Spring/Spring.Core/Core/TypeConversion/StringArrayConverter.cs +++ b/src/Spring/Spring.Core/Core/TypeConversion/StringArrayConverter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.ComponentModel; using System.Globalization; using Spring.Util; -#endregion - namespace Spring.Core.TypeConversion; /// diff --git a/src/Spring/Spring.Core/Core/TypeConversion/TimeSpanConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/TimeSpanConverter.cs index a7ea842f..b2df2620 100644 --- a/src/Spring/Spring.Core/Core/TypeConversion/TimeSpanConverter.cs +++ b/src/Spring/Spring.Core/Core/TypeConversion/TimeSpanConverter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,20 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.ComponentModel; using System.Globalization; using System.Text.RegularExpressions; -#endregion - namespace Spring.Core.TypeConversion; -#region Specifier parsers - using TimeSpanNullable = Nullable; /// @@ -187,8 +177,6 @@ class MillisecondSpecifier : SpecifierParser } } -#endregion - /// /// Converter for instances. /// @@ -196,24 +184,14 @@ class MillisecondSpecifier : SpecifierParser /// Roberto Paterlini public class TimeSpanConverter : System.ComponentModel.TimeSpanConverter { - #region Constants - static readonly SpecifierParser[] Specifiers = { new DaySpecifier(), new HourSpecifier(), new MinuteSpecifier(), new SecondSpecifier(), new MillisecondSpecifier() }; - #endregion - - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// class. /// public TimeSpanConverter() { } - #endregion - - #region Methods - /// /// Convert from a string value to a instance. /// @@ -253,6 +231,4 @@ public class TimeSpanConverter : System.ComponentModel.TimeSpanConverter return base.ConvertFrom(context, culture, value); } - - #endregion } diff --git a/src/Spring/Spring.Core/Core/TypeConversion/TypeConversionUtils.cs b/src/Spring/Spring.Core/Core/TypeConversion/TypeConversionUtils.cs index d8b0bfe1..79a8959d 100644 --- a/src/Spring/Spring.Core/Core/TypeConversion/TypeConversionUtils.cs +++ b/src/Spring/Spring.Core/Core/TypeConversion/TypeConversionUtils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.ComponentModel; using Spring.Util; using System.Reflection; -#endregion - namespace Spring.Core.TypeConversion; /// diff --git a/src/Spring/Spring.Core/Core/TypeConversion/TypeConverterRegistry.cs b/src/Spring/Spring.Core/Core/TypeConversion/TypeConverterRegistry.cs index 7df3d0c0..a6d567f8 100644 --- a/src/Spring/Spring.Core/Core/TypeConversion/TypeConverterRegistry.cs +++ b/src/Spring/Spring.Core/Core/TypeConversion/TypeConverterRegistry.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections.Specialized; using System.ComponentModel; using System.Drawing; @@ -30,8 +24,6 @@ using Microsoft.Win32; using Spring.Core.TypeResolution; using Spring.Util; -#endregion - namespace Spring.Core.TypeConversion; /// diff --git a/src/Spring/Spring.Core/Core/TypeConversion/UniqueKeyConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/UniqueKeyConverter.cs index 10804eb0..ef207d52 100644 --- a/src/Spring/Spring.Core/Core/TypeConversion/UniqueKeyConverter.cs +++ b/src/Spring/Spring.Core/Core/TypeConversion/UniqueKeyConverter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Importsusing System; - using System.ComponentModel; using System.Globalization; using Spring.Util; -#endregion - namespace Spring.Core.TypeConversion; /// diff --git a/src/Spring/Spring.Core/Core/TypeConversion/UriConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/UriConverter.cs index 24c27a85..2103d1aa 100644 --- a/src/Spring/Spring.Core/Core/TypeConversion/UriConverter.cs +++ b/src/Spring/Spring.Core/Core/TypeConversion/UriConverter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.ComponentModel; using System.Globalization; -#endregion - namespace Spring.Core.TypeConversion; /// @@ -34,18 +26,12 @@ namespace Spring.Core.TypeConversion; /// Mark Pollack (.NET) public class UriConverter : TypeConverter { - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// class. /// public UriConverter() { } - #endregion - - #region Methods - /// /// Returns whether this converter can convert an object of one /// to a @@ -112,6 +98,4 @@ public class UriConverter : TypeConverter return base.ConvertFrom(context, culture, value); } - - #endregion } diff --git a/src/Spring/Spring.Core/Core/TypeMismatchException.cs b/src/Spring/Spring.Core/Core/TypeMismatchException.cs index 76eed9d4..3c3fd39c 100644 --- a/src/Spring/Spring.Core/Core/TypeMismatchException.cs +++ b/src/Spring/Spring.Core/Core/TypeMismatchException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Runtime.Serialization; using System.Text; -#endregion - namespace Spring.Core; /// diff --git a/src/Spring/Spring.Core/Core/TypeResolution/CachedTypeResolver.cs b/src/Spring/Spring.Core/Core/TypeResolution/CachedTypeResolver.cs index 377a16f7..77de8055 100644 --- a/src/Spring/Spring.Core/Core/TypeResolution/CachedTypeResolver.cs +++ b/src/Spring/Spring.Core/Core/TypeResolution/CachedTypeResolver.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Collections.Specialized; using Spring.Util; -#endregion - namespace Spring.Core.TypeResolution; /// diff --git a/src/Spring/Spring.Core/Core/TypeResolution/GenericArgumentsHolder.cs b/src/Spring/Spring.Core/Core/TypeResolution/GenericArgumentsHolder.cs index 67c9f73f..5951a0e8 100644 --- a/src/Spring/Spring.Core/Core/TypeResolution/GenericArgumentsHolder.cs +++ b/src/Spring/Spring.Core/Core/TypeResolution/GenericArgumentsHolder.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Text.RegularExpressions; using Spring.Util; -#endregion - namespace Spring.Core.TypeResolution; /// @@ -38,8 +30,6 @@ namespace Spring.Core.TypeResolution; /// public class GenericArgumentsHolder { - #region Constants - private static readonly Regex ClrPattern = new Regex( "^" + @"(?'name'\w[\w\d\.]+)" @@ -95,19 +85,11 @@ public class GenericArgumentsHolder /// public const char GenericArgumentsSeparator = ','; - #endregion - - #region Fields - private string unresolvedGenericTypeName; private string unresolvedGenericMethodName; private string[] unresolvedGenericArguments; private string arrayDeclaration; - #endregion - - #region Constructor (s) / Destructor - /// /// Creates a new instance of the GenericArgumentsHolder class. /// @@ -120,10 +102,6 @@ public class GenericArgumentsHolder ParseGenericTypeDeclaration(value); } - #endregion - - #region Properties - /// /// The (unresolved) generic type name portion /// of the original value when parsing a generic type. @@ -196,10 +174,6 @@ public class GenericArgumentsHolder get { return arrayDeclaration != null; } } - #endregion - - #region Methods - /// /// Returns an array of unresolved generic arguments types. /// @@ -356,6 +330,4 @@ public class GenericArgumentsHolder // return (string[])args.ToArray(typeof(string)); } - - #endregion } diff --git a/src/Spring/Spring.Core/Core/TypeResolution/GenericTypeResolver.cs b/src/Spring/Spring.Core/Core/TypeResolution/GenericTypeResolver.cs index 5ddc6166..779ca5e5 100644 --- a/src/Spring/Spring.Core/Core/TypeResolution/GenericTypeResolver.cs +++ b/src/Spring/Spring.Core/Core/TypeResolution/GenericTypeResolver.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Util; -#endregion - namespace Spring.Core.TypeResolution; /// diff --git a/src/Spring/Spring.Core/Core/TypeResolution/ITypeResolver.cs b/src/Spring/Spring.Core/Core/TypeResolution/ITypeResolver.cs index 972176f5..04f201c7 100644 --- a/src/Spring/Spring.Core/Core/TypeResolution/ITypeResolver.cs +++ b/src/Spring/Spring.Core/Core/TypeResolution/ITypeResolver.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Core.TypeResolution; /// diff --git a/src/Spring/Spring.Core/Core/TypeResolution/TypeAssemblyHolder.cs b/src/Spring/Spring.Core/Core/TypeResolution/TypeAssemblyHolder.cs index a4388faa..43919612 100644 --- a/src/Spring/Spring.Core/Core/TypeResolution/TypeAssemblyHolder.cs +++ b/src/Spring/Spring.Core/Core/TypeResolution/TypeAssemblyHolder.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Util; -#endregion - namespace Spring.Core.TypeResolution; /// @@ -32,8 +24,6 @@ namespace Spring.Core.TypeResolution; /// public class TypeAssemblyHolder { - #region Constants - /// /// The string that separates a name /// from the name of it's attendant @@ -41,17 +31,9 @@ public class TypeAssemblyHolder /// public const string TypeAssemblySeparator = ","; - #endregion - - #region Fields - private string unresolvedAssemblyName; private string unresolvedTypeName; - #endregion - - #region Constructor (s) / Destructor - /// /// Creates a new instance of the TypeAssemblyHolder class. /// @@ -63,10 +45,6 @@ public class TypeAssemblyHolder SplitTypeAndAssemblyNames(unresolvedTypeName); } - #endregion - - #region Properties - /// /// The (unresolved) type name portion of the original type name. /// @@ -91,10 +69,6 @@ public class TypeAssemblyHolder get { return StringUtils.HasText(AssemblyName); } } - #endregion - - #region Methods - private void SplitTypeAndAssemblyNames(string originalTypeName) { // generic types may look like: @@ -115,6 +89,4 @@ public class TypeAssemblyHolder typeAssemblyIndex + 1).Trim(); } } - - #endregion } diff --git a/src/Spring/Spring.Core/Core/TypeResolution/TypeRegistry.cs b/src/Spring/Spring.Core/Core/TypeResolution/TypeRegistry.cs index eda6454b..8cf55f82 100644 --- a/src/Spring/Spring.Core/Core/TypeResolution/TypeRegistry.cs +++ b/src/Spring/Spring.Core/Core/TypeResolution/TypeRegistry.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Util; -#endregion - namespace Spring.Core.TypeResolution; /// @@ -45,8 +37,6 @@ namespace Spring.Core.TypeResolution; /// public sealed class TypeRegistry { - #region Constants - /// /// Name of the .Net config section that contains Spring.Net type aliases. /// @@ -422,17 +412,9 @@ public sealed class TypeRegistry /// public const string NullableBoolArrayAlias = "bool?[]"; - #endregion - - #region Fields - private static readonly object syncRoot = new object(); private static IDictionary types = new Dictionary(); - #endregion - - #region Constructor (s) / Destructor - /// /// Registers standard and user-configured type aliases. /// @@ -550,8 +532,6 @@ public sealed class TypeRegistry } } - #endregion - /// /// Registers an alias for the specified . /// diff --git a/src/Spring/Spring.Core/Core/TypeResolution/TypeResolutionUtils.cs b/src/Spring/Spring.Core/Core/TypeResolution/TypeResolutionUtils.cs index fdac82bf..9f785c41 100644 --- a/src/Spring/Spring.Core/Core/TypeResolution/TypeResolutionUtils.cs +++ b/src/Spring/Spring.Core/Core/TypeResolution/TypeResolutionUtils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Globalization; using System.Text.RegularExpressions; using System.Reflection; using Spring.Util; -#endregion - namespace Spring.Core.TypeResolution; /// @@ -40,17 +32,9 @@ namespace Spring.Core.TypeResolution; /// Bruno Baia public sealed class TypeResolutionUtils { - #region Fields - private static readonly ITypeResolver internalTypeResolver = new CachedTypeResolver(new GenericTypeResolver()); - #endregion - - #region Constructor (s) / Destructor - - // CLOVER:OFF - /// /// Creates a new instance of the class. /// @@ -63,12 +47,6 @@ public sealed class TypeResolutionUtils { } - // CLOVER:ON - - #endregion - - #region Methods - /// /// Resolves the supplied type name into a /// instance. @@ -146,8 +124,6 @@ public sealed class TypeResolutionUtils return interfaces; } - #region MethodMatch - // TODO : Use the future Pointcut expression language instead private readonly static Regex methodMatchRegex = new Regex( @@ -201,8 +177,4 @@ public sealed class TypeResolutionUtils return true; } - - #endregion - - #endregion } diff --git a/src/Spring/Spring.Core/Core/TypeResolution/TypeResolver.cs b/src/Spring/Spring.Core/Core/TypeResolution/TypeResolver.cs index 86da84b1..f4dbfeea 100644 --- a/src/Spring/Spring.Core/Core/TypeResolution/TypeResolver.cs +++ b/src/Spring/Spring.Core/Core/TypeResolution/TypeResolver.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using Spring.Util; -#endregion - namespace Spring.Core.TypeResolution; /// diff --git a/src/Spring/Spring.Core/DataBinding/AbstractBinding.cs b/src/Spring/Spring.Core/DataBinding/AbstractBinding.cs index 8269b2d7..37066d60 100644 --- a/src/Spring/Spring.Core/DataBinding/AbstractBinding.cs +++ b/src/Spring/Spring.Core/DataBinding/AbstractBinding.cs @@ -10,8 +10,6 @@ namespace Spring.DataBinding; /// Aleksandar Seovic public abstract class AbstractBinding : IBinding { - #region Fields - /// /// The name of the always filled error provider /// @@ -24,10 +22,6 @@ public abstract class AbstractBinding : IBinding private BindingErrorMessage errorMessage; private string[] errorProviders; - #endregion - - #region Properties - /// /// Gets or sets a flag specifying whether this binding is valid. /// @@ -99,8 +93,6 @@ public abstract class AbstractBinding : IBinding get { return errorProviders; } } - #endregion - /// /// Initializes a new instance of the class. /// @@ -110,8 +102,6 @@ public abstract class AbstractBinding : IBinding this.errorProviders = new string[] { ALL_BINDINGERRORS_PROVIDER }; } - #region IBinding Implementation - /// /// Binds source object to target object. /// @@ -207,8 +197,6 @@ public abstract class AbstractBinding : IBinding this.errorProviders = errorProviders; } - #endregion - /// ///Determines whether the specified is equal to the current . /// diff --git a/src/Spring/Spring.Core/DataBinding/AbstractSimpleBinding.cs b/src/Spring/Spring.Core/DataBinding/AbstractSimpleBinding.cs index 7e2f088e..7f4a23fd 100644 --- a/src/Spring/Spring.Core/DataBinding/AbstractSimpleBinding.cs +++ b/src/Spring/Spring.Core/DataBinding/AbstractSimpleBinding.cs @@ -11,15 +11,9 @@ namespace Spring.DataBinding; /// Aleksandar Seovic public abstract class AbstractSimpleBinding : AbstractBinding { - #region Fields - private readonly ILogger log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private IFormatter formatter; - #endregion - - #region Constructor(s) - /// /// Initialize a new instance of without any /// @@ -36,10 +30,6 @@ public abstract class AbstractSimpleBinding : AbstractBinding this.formatter = formatter; } - #endregion - - #region Properties - /// /// Gets or sets the to use. /// @@ -50,10 +40,6 @@ public abstract class AbstractSimpleBinding : AbstractBinding set { formatter = value; } } - #endregion - - #region IBinding Implementation - /// /// Binds source object to target object. /// @@ -163,10 +149,6 @@ public abstract class AbstractSimpleBinding : AbstractBinding this.SetSourceValue(source, value, variables); } - #endregion - - #region Abstract Methods - /// /// Gets the source value for the binding. /// @@ -222,6 +204,4 @@ public abstract class AbstractSimpleBinding : AbstractBinding /// Variables for expression evaluation. /// protected abstract void SetTargetValue(object target, object value, IDictionary variables); - - #endregion } diff --git a/src/Spring/Spring.Core/DataBinding/BaseBindingContainer.cs b/src/Spring/Spring.Core/DataBinding/BaseBindingContainer.cs index ff564873..46e289eb 100644 --- a/src/Spring/Spring.Core/DataBinding/BaseBindingContainer.cs +++ b/src/Spring/Spring.Core/DataBinding/BaseBindingContainer.cs @@ -9,14 +9,8 @@ namespace Spring.DataBinding; /// Aleksandar Seovic public class BaseBindingContainer : IBindingContainer { - #region Fields - private IList bindings = new List(); - #endregion - - #region Constructor(s) - /// /// Creates a new instance of . /// @@ -24,10 +18,6 @@ public class BaseBindingContainer : IBindingContainer { } - #endregion - - #region Properties - /// /// Gets a list of bindings for this container. /// @@ -39,10 +29,6 @@ public class BaseBindingContainer : IBindingContainer get { return bindings; } } - #endregion - - #region IBindingContainer Implementation - /// /// Gets a value indicating whether this instance has bindings. /// @@ -157,10 +143,6 @@ public class BaseBindingContainer : IBindingContainer return binding; } - #endregion - - #region IBinding Implementation - /// /// Binds source object to target object. /// @@ -254,6 +236,4 @@ public class BaseBindingContainer : IBindingContainer public virtual void SetErrorMessage(string messageId, params string[] errorProviders) { } - - #endregion } diff --git a/src/Spring/Spring.Core/DataBinding/BaseBindingManager.cs b/src/Spring/Spring.Core/DataBinding/BaseBindingManager.cs index e558d44a..569c2541 100644 --- a/src/Spring/Spring.Core/DataBinding/BaseBindingManager.cs +++ b/src/Spring/Spring.Core/DataBinding/BaseBindingManager.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.DataBinding; /// @@ -27,14 +23,10 @@ namespace Spring.DataBinding; /// Aleksandar Seovic public class BaseBindingManager : BaseBindingContainer { - #region Constructor(s) - /// /// Initializes a new instance of the class. /// public BaseBindingManager() { } - - #endregion } diff --git a/src/Spring/Spring.Core/DataBinding/BindingDirection.cs b/src/Spring/Spring.Core/DataBinding/BindingDirection.cs index cc6b1542..3a048598 100644 --- a/src/Spring/Spring.Core/DataBinding/BindingDirection.cs +++ b/src/Spring/Spring.Core/DataBinding/BindingDirection.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.DataBinding; /// diff --git a/src/Spring/Spring.Core/DataBinding/BindingErrorMessage.cs b/src/Spring/Spring.Core/DataBinding/BindingErrorMessage.cs index a8ee7f52..8babb0a9 100644 --- a/src/Spring/Spring.Core/DataBinding/BindingErrorMessage.cs +++ b/src/Spring/Spring.Core/DataBinding/BindingErrorMessage.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Util; using Spring.Validation; diff --git a/src/Spring/Spring.Core/DataBinding/IDataBound.cs b/src/Spring/Spring.Core/DataBinding/IDataBound.cs index 846c8735..e34461b8 100644 --- a/src/Spring/Spring.Core/DataBinding/IDataBound.cs +++ b/src/Spring/Spring.Core/DataBinding/IDataBound.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.DataBinding; /// diff --git a/src/Spring/Spring.Core/DataBinding/SimpleExpressionBinding.cs b/src/Spring/Spring.Core/DataBinding/SimpleExpressionBinding.cs index 5810e6c3..49e78c66 100644 --- a/src/Spring/Spring.Core/DataBinding/SimpleExpressionBinding.cs +++ b/src/Spring/Spring.Core/DataBinding/SimpleExpressionBinding.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Expressions; using Spring.Globalization; @@ -30,15 +26,9 @@ namespace Spring.DataBinding; /// Aleksandar Seovic public class SimpleExpressionBinding : AbstractSimpleBinding { - #region Fields - private IExpression sourceExpression; private IExpression targetExpression; - #endregion - - #region Constructor(s) - /// /// Initializes a new instance of the class. /// @@ -73,10 +63,6 @@ public class SimpleExpressionBinding : AbstractSimpleBinding this.targetExpression = Expression.Parse(targetExpression); } - #endregion - - #region Properties - /// /// Gets the source expression. /// @@ -95,10 +81,6 @@ public class SimpleExpressionBinding : AbstractSimpleBinding get { return targetExpression; } } - #endregion - - #region Abstract Methods Implementation - /// /// Gets the source value for the binding. /// @@ -166,6 +148,4 @@ public class SimpleExpressionBinding : AbstractSimpleBinding { this.TargetExpression.SetValue(target, variables, value); } - - #endregion } diff --git a/src/Spring/Spring.Core/Expressions/ArrayConstructorNode.cs b/src/Spring/Spring.Core/Expressions/ArrayConstructorNode.cs index 6b385519..ad67efa0 100644 --- a/src/Spring/Spring.Core/Expressions/ArrayConstructorNode.cs +++ b/src/Spring/Spring.Core/Expressions/ArrayConstructorNode.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Runtime.Serialization; using Spring.Core.TypeResolution; diff --git a/src/Spring/Spring.Core/Expressions/AssignNode.cs b/src/Spring/Spring.Core/Expressions/AssignNode.cs index e86d5ea4..57f93bf7 100644 --- a/src/Spring/Spring.Core/Expressions/AssignNode.cs +++ b/src/Spring/Spring.Core/Expressions/AssignNode.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using Spring.Expressions.Parser.antlr.collections; diff --git a/src/Spring/Spring.Core/Expressions/AttributeNode.cs b/src/Spring/Spring.Core/Expressions/AttributeNode.cs index 5e86dd37..7edb7318 100644 --- a/src/Spring/Spring.Core/Expressions/AttributeNode.cs +++ b/src/Spring/Spring.Core/Expressions/AttributeNode.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using Spring.Core.TypeResolution; diff --git a/src/Spring/Spring.Core/Expressions/BaseNode.cs b/src/Spring/Spring.Core/Expressions/BaseNode.cs index 855884b5..e1465183 100644 --- a/src/Spring/Spring.Core/Expressions/BaseNode.cs +++ b/src/Spring/Spring.Core/Expressions/BaseNode.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Runtime.Serialization; @@ -38,15 +34,11 @@ public abstract class BaseNode : SpringAST, IExpression } } - #region EvaluationContext class - /// /// Holds the state during evaluating an expression. /// protected class EvaluationContext { - #region Holder classes - private class ThisContextHolder : IDisposable { private readonly EvaluationContext owner; @@ -82,8 +74,6 @@ public abstract class BaseNode : SpringAST, IExpression } } - #endregion - /// /// Gets/Sets the root context of the current evaluation /// @@ -138,8 +128,6 @@ public abstract class BaseNode : SpringAST, IExpression } } - #endregion - /// /// Create a new instance /// diff --git a/src/Spring/Spring.Core/Expressions/BinaryOperator.cs b/src/Spring/Spring.Core/Expressions/BinaryOperator.cs index 4044540b..0f6a9404 100644 --- a/src/Spring/Spring.Core/Expressions/BinaryOperator.cs +++ b/src/Spring/Spring.Core/Expressions/BinaryOperator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Expressions; diff --git a/src/Spring/Spring.Core/Expressions/BooleanLiteralNode.cs b/src/Spring/Spring.Core/Expressions/BooleanLiteralNode.cs index 0ac098d5..66e3eefc 100644 --- a/src/Spring/Spring.Core/Expressions/BooleanLiteralNode.cs +++ b/src/Spring/Spring.Core/Expressions/BooleanLiteralNode.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Expressions; diff --git a/src/Spring/Spring.Core/Expressions/ConstructorNode.cs b/src/Spring/Spring.Core/Expressions/ConstructorNode.cs index 8cd31608..dd306639 100644 --- a/src/Spring/Spring.Core/Expressions/ConstructorNode.cs +++ b/src/Spring/Spring.Core/Expressions/ConstructorNode.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Reflection; using System.Runtime.Serialization; diff --git a/src/Spring/Spring.Core/Expressions/DefaultNode.cs b/src/Spring/Spring.Core/Expressions/DefaultNode.cs index a3800000..31284d03 100644 --- a/src/Spring/Spring.Core/Expressions/DefaultNode.cs +++ b/src/Spring/Spring.Core/Expressions/DefaultNode.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Expressions; diff --git a/src/Spring/Spring.Core/Expressions/Expression.cs b/src/Spring/Spring.Core/Expressions/Expression.cs index d44e6e70..f81d90e0 100644 --- a/src/Spring/Spring.Core/Expressions/Expression.cs +++ b/src/Spring/Spring.Core/Expressions/Expression.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Reflection; using System.Runtime.Serialization; diff --git a/src/Spring/Spring.Core/Expressions/ExpressionConverter.cs b/src/Spring/Spring.Core/Expressions/ExpressionConverter.cs index 12034c2b..3024e2ab 100644 --- a/src/Spring/Spring.Core/Expressions/ExpressionConverter.cs +++ b/src/Spring/Spring.Core/Expressions/ExpressionConverter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.ComponentModel; using System.Globalization; diff --git a/src/Spring/Spring.Core/Expressions/ExpressionEvaluator.cs b/src/Spring/Spring.Core/Expressions/ExpressionEvaluator.cs index 0df2e90b..005b546f 100644 --- a/src/Spring/Spring.Core/Expressions/ExpressionEvaluator.cs +++ b/src/Spring/Spring.Core/Expressions/ExpressionEvaluator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Expressions; /// diff --git a/src/Spring/Spring.Core/Expressions/ExpressionListNode.cs b/src/Spring/Spring.Core/Expressions/ExpressionListNode.cs index 1a2d0d7f..a193dd7c 100644 --- a/src/Spring/Spring.Core/Expressions/ExpressionListNode.cs +++ b/src/Spring/Spring.Core/Expressions/ExpressionListNode.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using Spring.Expressions.Parser.antlr.collections; diff --git a/src/Spring/Spring.Core/Expressions/FunctionNode.cs b/src/Spring/Spring.Core/Expressions/FunctionNode.cs index 9876dc8c..3b42f2bc 100644 --- a/src/Spring/Spring.Core/Expressions/FunctionNode.cs +++ b/src/Spring/Spring.Core/Expressions/FunctionNode.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using Spring.Reflection.Dynamic; diff --git a/src/Spring/Spring.Core/Expressions/HexLiteralNode.cs b/src/Spring/Spring.Core/Expressions/HexLiteralNode.cs index 43e91a39..a05dd94d 100644 --- a/src/Spring/Spring.Core/Expressions/HexLiteralNode.cs +++ b/src/Spring/Spring.Core/Expressions/HexLiteralNode.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using System.Runtime.Serialization; diff --git a/src/Spring/Spring.Core/Expressions/IExpression.cs b/src/Spring/Spring.Core/Expressions/IExpression.cs index 5c8bee0b..505fade1 100644 --- a/src/Spring/Spring.Core/Expressions/IExpression.cs +++ b/src/Spring/Spring.Core/Expressions/IExpression.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.ComponentModel; namespace Spring.Expressions; diff --git a/src/Spring/Spring.Core/Expressions/IndexerNode.cs b/src/Spring/Spring.Core/Expressions/IndexerNode.cs index 88669d82..b77d8505 100644 --- a/src/Spring/Spring.Core/Expressions/IndexerNode.cs +++ b/src/Spring/Spring.Core/Expressions/IndexerNode.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Reflection; using System.Runtime.Serialization; diff --git a/src/Spring/Spring.Core/Expressions/IntLiteralNode.cs b/src/Spring/Spring.Core/Expressions/IntLiteralNode.cs index eec37b82..65527cce 100644 --- a/src/Spring/Spring.Core/Expressions/IntLiteralNode.cs +++ b/src/Spring/Spring.Core/Expressions/IntLiteralNode.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Expressions; diff --git a/src/Spring/Spring.Core/Expressions/LambdaExpressionNode.cs b/src/Spring/Spring.Core/Expressions/LambdaExpressionNode.cs index cc8e28e3..1cc831e3 100644 --- a/src/Spring/Spring.Core/Expressions/LambdaExpressionNode.cs +++ b/src/Spring/Spring.Core/Expressions/LambdaExpressionNode.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Runtime.Serialization; using Spring.Expressions.Parser.antlr.collections; diff --git a/src/Spring/Spring.Core/Expressions/ListInitializerNode.cs b/src/Spring/Spring.Core/Expressions/ListInitializerNode.cs index d87b0837..8a2467f9 100644 --- a/src/Spring/Spring.Core/Expressions/ListInitializerNode.cs +++ b/src/Spring/Spring.Core/Expressions/ListInitializerNode.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Runtime.Serialization; diff --git a/src/Spring/Spring.Core/Expressions/LocalFunctionNode.cs b/src/Spring/Spring.Core/Expressions/LocalFunctionNode.cs index 83208d26..91e75a41 100644 --- a/src/Spring/Spring.Core/Expressions/LocalFunctionNode.cs +++ b/src/Spring/Spring.Core/Expressions/LocalFunctionNode.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Runtime.Serialization; diff --git a/src/Spring/Spring.Core/Expressions/LocalVariableNode.cs b/src/Spring/Spring.Core/Expressions/LocalVariableNode.cs index f356debb..f896e428 100644 --- a/src/Spring/Spring.Core/Expressions/LocalVariableNode.cs +++ b/src/Spring/Spring.Core/Expressions/LocalVariableNode.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Runtime.Serialization; diff --git a/src/Spring/Spring.Core/Expressions/MapEntryNode.cs b/src/Spring/Spring.Core/Expressions/MapEntryNode.cs index efc5b0b0..f56bf5f6 100644 --- a/src/Spring/Spring.Core/Expressions/MapEntryNode.cs +++ b/src/Spring/Spring.Core/Expressions/MapEntryNode.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Runtime.Serialization; diff --git a/src/Spring/Spring.Core/Expressions/MapInitializerNode.cs b/src/Spring/Spring.Core/Expressions/MapInitializerNode.cs index b54ae198..6744288f 100644 --- a/src/Spring/Spring.Core/Expressions/MapInitializerNode.cs +++ b/src/Spring/Spring.Core/Expressions/MapInitializerNode.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Runtime.Serialization; using Spring.Expressions.Parser.antlr.collections; diff --git a/src/Spring/Spring.Core/Expressions/MethodNode.cs b/src/Spring/Spring.Core/Expressions/MethodNode.cs index 01803d35..2c2d3467 100644 --- a/src/Spring/Spring.Core/Expressions/MethodNode.cs +++ b/src/Spring/Spring.Core/Expressions/MethodNode.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Reflection; using System.Runtime.Serialization; diff --git a/src/Spring/Spring.Core/Expressions/NamedArgumentNode.cs b/src/Spring/Spring.Core/Expressions/NamedArgumentNode.cs index 6cd0b5d4..8c47ce1c 100644 --- a/src/Spring/Spring.Core/Expressions/NamedArgumentNode.cs +++ b/src/Spring/Spring.Core/Expressions/NamedArgumentNode.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Expressions; diff --git a/src/Spring/Spring.Core/Expressions/NodeWithArguments.cs b/src/Spring/Spring.Core/Expressions/NodeWithArguments.cs index bdec7aa3..c89e532b 100644 --- a/src/Spring/Spring.Core/Expressions/NodeWithArguments.cs +++ b/src/Spring/Spring.Core/Expressions/NodeWithArguments.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Runtime.Serialization; using Spring.Expressions.Parser.antlr.collections; diff --git a/src/Spring/Spring.Core/Expressions/NullLiteralNode.cs b/src/Spring/Spring.Core/Expressions/NullLiteralNode.cs index 0575bc4f..0b7d5aa7 100644 --- a/src/Spring/Spring.Core/Expressions/NullLiteralNode.cs +++ b/src/Spring/Spring.Core/Expressions/NullLiteralNode.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Expressions; diff --git a/src/Spring/Spring.Core/Expressions/OpADD.cs b/src/Spring/Spring.Core/Expressions/OpADD.cs index addf2bc4..995f2eee 100644 --- a/src/Spring/Spring.Core/Expressions/OpADD.cs +++ b/src/Spring/Spring.Core/Expressions/OpADD.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Runtime.Serialization; using Spring.Collections; diff --git a/src/Spring/Spring.Core/Expressions/OpAND.cs b/src/Spring/Spring.Core/Expressions/OpAND.cs index ddb968c3..c47ce16e 100644 --- a/src/Spring/Spring.Core/Expressions/OpAND.cs +++ b/src/Spring/Spring.Core/Expressions/OpAND.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using Spring.Util; diff --git a/src/Spring/Spring.Core/Expressions/OpBetween.cs b/src/Spring/Spring.Core/Expressions/OpBetween.cs index a8c8a9b3..c4c915ac 100644 --- a/src/Spring/Spring.Core/Expressions/OpBetween.cs +++ b/src/Spring/Spring.Core/Expressions/OpBetween.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Runtime.Serialization; using Spring.Util; diff --git a/src/Spring/Spring.Core/Expressions/OpDIVIDE.cs b/src/Spring/Spring.Core/Expressions/OpDIVIDE.cs index 1b20a1dc..0a46f26a 100644 --- a/src/Spring/Spring.Core/Expressions/OpDIVIDE.cs +++ b/src/Spring/Spring.Core/Expressions/OpDIVIDE.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using Spring.Util; diff --git a/src/Spring/Spring.Core/Expressions/OpEqual.cs b/src/Spring/Spring.Core/Expressions/OpEqual.cs index d9fed1ce..88cc8a1d 100644 --- a/src/Spring/Spring.Core/Expressions/OpEqual.cs +++ b/src/Spring/Spring.Core/Expressions/OpEqual.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using Spring.Util; diff --git a/src/Spring/Spring.Core/Expressions/OpGreater.cs b/src/Spring/Spring.Core/Expressions/OpGreater.cs index 657f2c37..e2ec4440 100644 --- a/src/Spring/Spring.Core/Expressions/OpGreater.cs +++ b/src/Spring/Spring.Core/Expressions/OpGreater.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using Spring.Util; diff --git a/src/Spring/Spring.Core/Expressions/OpGreaterOrEqual.cs b/src/Spring/Spring.Core/Expressions/OpGreaterOrEqual.cs index 8a6bcd28..b4530f53 100644 --- a/src/Spring/Spring.Core/Expressions/OpGreaterOrEqual.cs +++ b/src/Spring/Spring.Core/Expressions/OpGreaterOrEqual.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using Spring.Util; diff --git a/src/Spring/Spring.Core/Expressions/OpIn.cs b/src/Spring/Spring.Core/Expressions/OpIn.cs index 126fc097..42422662 100644 --- a/src/Spring/Spring.Core/Expressions/OpIn.cs +++ b/src/Spring/Spring.Core/Expressions/OpIn.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Runtime.Serialization; diff --git a/src/Spring/Spring.Core/Expressions/OpIs.cs b/src/Spring/Spring.Core/Expressions/OpIs.cs index 0a1822d8..5c6fe5c7 100644 --- a/src/Spring/Spring.Core/Expressions/OpIs.cs +++ b/src/Spring/Spring.Core/Expressions/OpIs.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Expressions; diff --git a/src/Spring/Spring.Core/Expressions/OpLess.cs b/src/Spring/Spring.Core/Expressions/OpLess.cs index 94401072..b0b1f8f8 100644 --- a/src/Spring/Spring.Core/Expressions/OpLess.cs +++ b/src/Spring/Spring.Core/Expressions/OpLess.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using Spring.Util; diff --git a/src/Spring/Spring.Core/Expressions/OpLessOrEqual.cs b/src/Spring/Spring.Core/Expressions/OpLessOrEqual.cs index dd5a7923..07b8b99e 100644 --- a/src/Spring/Spring.Core/Expressions/OpLessOrEqual.cs +++ b/src/Spring/Spring.Core/Expressions/OpLessOrEqual.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using Spring.Util; diff --git a/src/Spring/Spring.Core/Expressions/OpLike.cs b/src/Spring/Spring.Core/Expressions/OpLike.cs index fcab9330..326867fe 100644 --- a/src/Spring/Spring.Core/Expressions/OpLike.cs +++ b/src/Spring/Spring.Core/Expressions/OpLike.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using System.Text; using System.Text.RegularExpressions; diff --git a/src/Spring/Spring.Core/Expressions/OpMODULUS.cs b/src/Spring/Spring.Core/Expressions/OpMODULUS.cs index 7b497a60..e5e9226d 100644 --- a/src/Spring/Spring.Core/Expressions/OpMODULUS.cs +++ b/src/Spring/Spring.Core/Expressions/OpMODULUS.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using Spring.Util; diff --git a/src/Spring/Spring.Core/Expressions/OpMULTIPLY.cs b/src/Spring/Spring.Core/Expressions/OpMULTIPLY.cs index 6fad20ad..e074dc3a 100644 --- a/src/Spring/Spring.Core/Expressions/OpMULTIPLY.cs +++ b/src/Spring/Spring.Core/Expressions/OpMULTIPLY.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Runtime.Serialization; using Spring.Collections; diff --git a/src/Spring/Spring.Core/Expressions/OpMatches.cs b/src/Spring/Spring.Core/Expressions/OpMatches.cs index ed0ca429..1ea6979b 100644 --- a/src/Spring/Spring.Core/Expressions/OpMatches.cs +++ b/src/Spring/Spring.Core/Expressions/OpMatches.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using System.Text.RegularExpressions; diff --git a/src/Spring/Spring.Core/Expressions/OpNOT.cs b/src/Spring/Spring.Core/Expressions/OpNOT.cs index 5cd83403..cc6868c2 100644 --- a/src/Spring/Spring.Core/Expressions/OpNOT.cs +++ b/src/Spring/Spring.Core/Expressions/OpNOT.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using Spring.Util; diff --git a/src/Spring/Spring.Core/Expressions/OpNotEqual.cs b/src/Spring/Spring.Core/Expressions/OpNotEqual.cs index 27e41354..4b838de2 100644 --- a/src/Spring/Spring.Core/Expressions/OpNotEqual.cs +++ b/src/Spring/Spring.Core/Expressions/OpNotEqual.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using Spring.Util; diff --git a/src/Spring/Spring.Core/Expressions/OpOR.cs b/src/Spring/Spring.Core/Expressions/OpOR.cs index a80a73d8..1004b2dd 100644 --- a/src/Spring/Spring.Core/Expressions/OpOR.cs +++ b/src/Spring/Spring.Core/Expressions/OpOR.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using Spring.Util; diff --git a/src/Spring/Spring.Core/Expressions/OpPOWER.cs b/src/Spring/Spring.Core/Expressions/OpPOWER.cs index ba98d2ec..3170c768 100644 --- a/src/Spring/Spring.Core/Expressions/OpPOWER.cs +++ b/src/Spring/Spring.Core/Expressions/OpPOWER.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using Spring.Util; diff --git a/src/Spring/Spring.Core/Expressions/OpSUBTRACT.cs b/src/Spring/Spring.Core/Expressions/OpSUBTRACT.cs index 419daea5..40a70556 100644 --- a/src/Spring/Spring.Core/Expressions/OpSUBTRACT.cs +++ b/src/Spring/Spring.Core/Expressions/OpSUBTRACT.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Runtime.Serialization; using Spring.Collections; diff --git a/src/Spring/Spring.Core/Expressions/OpUnaryMinus.cs b/src/Spring/Spring.Core/Expressions/OpUnaryMinus.cs index 580062b9..75b8db65 100644 --- a/src/Spring/Spring.Core/Expressions/OpUnaryMinus.cs +++ b/src/Spring/Spring.Core/Expressions/OpUnaryMinus.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using Spring.Util; diff --git a/src/Spring/Spring.Core/Expressions/OpUnaryPlus.cs b/src/Spring/Spring.Core/Expressions/OpUnaryPlus.cs index e592ac6c..2b0c42b7 100644 --- a/src/Spring/Spring.Core/Expressions/OpUnaryPlus.cs +++ b/src/Spring/Spring.Core/Expressions/OpUnaryPlus.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using Spring.Util; diff --git a/src/Spring/Spring.Core/Expressions/OpXOR.cs b/src/Spring/Spring.Core/Expressions/OpXOR.cs index af45dff7..e6faac1f 100644 --- a/src/Spring/Spring.Core/Expressions/OpXOR.cs +++ b/src/Spring/Spring.Core/Expressions/OpXOR.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using Spring.Util; diff --git a/src/Spring/Spring.Core/Expressions/Parser/ExpressionParser.cs b/src/Spring/Spring.Core/Expressions/Parser/ExpressionParser.cs index ba692cfd..a9f30c6a 100644 --- a/src/Spring/Spring.Core/Expressions/Parser/ExpressionParser.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/ExpressionParser.cs @@ -88,8 +88,6 @@ internal class ExpressionParser : antlr.LLkParser public const int SIGN = 70; public const int REAL_TYPE_SUFFIX = 71; - // CLOVER:OFF - public override void reportError(RecognitionException ex) { //base.reportError(ex); diff --git a/src/Spring/Spring.Core/Expressions/Parser/antlr/ASTNULLType.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/ASTNULLType.cs index 2ddaf41e..7b976753 100644 --- a/src/Spring/Spring.Core/Expressions/Parser/antlr/ASTNULLType.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/ASTNULLType.cs @@ -130,12 +130,8 @@ public class ASTNULLType : AST return getText(); } - #region Implementation of ICloneable - public object Clone() { return MemberwiseClone(); } - - #endregion } diff --git a/src/Spring/Spring.Core/Expressions/Parser/antlr/BaseAST.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/BaseAST.cs index 2b210d52..2ffa6c15 100644 --- a/src/Spring/Spring.Core/Expressions/Parser/antlr/BaseAST.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/BaseAST.cs @@ -613,16 +613,12 @@ public abstract class BaseAST : AST } } - #region Implementation of ICloneable - [Obsolete("Deprecated since version 2.7.2. Use ASTFactory.dup() instead.", false)] public virtual object Clone() { return MemberwiseClone(); } - #endregion - public override Int32 GetHashCode() { return base.GetHashCode(); diff --git a/src/Spring/Spring.Core/Expressions/Parser/antlr/CommonAST.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/CommonAST.cs index 44788eb9..5c23340b 100644 --- a/src/Spring/Spring.Core/Expressions/Parser/antlr/CommonAST.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/CommonAST.cs @@ -86,16 +86,12 @@ public class CommonAST : BaseAST this.Type = ttype_; } - #region Implementation of ICloneable - [Obsolete("Deprecated since version 2.7.2. Use ASTFactory.dup() instead.", false)] override public object Clone() { return new CommonAST(this); } - #endregion - public class CommonASTCreator : ASTNodeCreator { public CommonASTCreator() { } diff --git a/src/Spring/Spring.Core/Expressions/Parser/antlr/CommonASTWithHiddenTokens.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/CommonASTWithHiddenTokens.cs index 43123489..b10ce219 100644 --- a/src/Spring/Spring.Core/Expressions/Parser/antlr/CommonASTWithHiddenTokens.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/CommonASTWithHiddenTokens.cs @@ -65,16 +65,12 @@ public class CommonASTWithHiddenTokens : CommonAST hiddenAfter = t.getHiddenAfter(); } - #region Implementation of ICloneable - [Obsolete("Deprecated since version 2.7.2. Use ASTFactory.dup() instead.", false)] override public object Clone() { return new CommonASTWithHiddenTokens(this); } - #endregion - public class CommonASTWithHiddenTokensCreator : ASTNodeCreator { public CommonASTWithHiddenTokensCreator() { } diff --git a/src/Spring/Spring.Core/Expressions/Processors/AverageAggregator.cs b/src/Spring/Spring.Core/Expressions/Processors/AverageAggregator.cs index bdd74f77..63955290 100644 --- a/src/Spring/Spring.Core/Expressions/Processors/AverageAggregator.cs +++ b/src/Spring/Spring.Core/Expressions/Processors/AverageAggregator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Spring.Util; diff --git a/src/Spring/Spring.Core/Expressions/Processors/ConversionProcessor.cs b/src/Spring/Spring.Core/Expressions/Processors/ConversionProcessor.cs index 6e0b63a2..848c3b4c 100644 --- a/src/Spring/Spring.Core/Expressions/Processors/ConversionProcessor.cs +++ b/src/Spring/Spring.Core/Expressions/Processors/ConversionProcessor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Spring.Core.TypeConversion; diff --git a/src/Spring/Spring.Core/Expressions/Processors/CountAggregator.cs b/src/Spring/Spring.Core/Expressions/Processors/CountAggregator.cs index 766125ec..b9e8a418 100644 --- a/src/Spring/Spring.Core/Expressions/Processors/CountAggregator.cs +++ b/src/Spring/Spring.Core/Expressions/Processors/CountAggregator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; namespace Spring.Expressions.Processors; diff --git a/src/Spring/Spring.Core/Expressions/Processors/DateConversionProcessor.cs b/src/Spring/Spring.Core/Expressions/Processors/DateConversionProcessor.cs index 65450745..d42e66ec 100644 --- a/src/Spring/Spring.Core/Expressions/Processors/DateConversionProcessor.cs +++ b/src/Spring/Spring.Core/Expressions/Processors/DateConversionProcessor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; namespace Spring.Expressions.Processors; diff --git a/src/Spring/Spring.Core/Expressions/Processors/DistinctProcessor.cs b/src/Spring/Spring.Core/Expressions/Processors/DistinctProcessor.cs index 441ab0e6..2d4e0c8e 100644 --- a/src/Spring/Spring.Core/Expressions/Processors/DistinctProcessor.cs +++ b/src/Spring/Spring.Core/Expressions/Processors/DistinctProcessor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Spring.Collections; diff --git a/src/Spring/Spring.Core/Expressions/Processors/ICollectionProcessor.cs b/src/Spring/Spring.Core/Expressions/Processors/ICollectionProcessor.cs index 0b6c0590..44ebc07c 100644 --- a/src/Spring/Spring.Core/Expressions/Processors/ICollectionProcessor.cs +++ b/src/Spring/Spring.Core/Expressions/Processors/ICollectionProcessor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; namespace Spring.Expressions.Processors; diff --git a/src/Spring/Spring.Core/Expressions/Processors/IMethodCallProcessor.cs b/src/Spring/Spring.Core/Expressions/Processors/IMethodCallProcessor.cs index 66ab6be2..5d1f6626 100644 --- a/src/Spring/Spring.Core/Expressions/Processors/IMethodCallProcessor.cs +++ b/src/Spring/Spring.Core/Expressions/Processors/IMethodCallProcessor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Expressions.Processors; /// diff --git a/src/Spring/Spring.Core/Expressions/Processors/MaxAggregator.cs b/src/Spring/Spring.Core/Expressions/Processors/MaxAggregator.cs index 488db3a7..26f63275 100644 --- a/src/Spring/Spring.Core/Expressions/Processors/MaxAggregator.cs +++ b/src/Spring/Spring.Core/Expressions/Processors/MaxAggregator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Spring.Util; diff --git a/src/Spring/Spring.Core/Expressions/Processors/MinAggregator.cs b/src/Spring/Spring.Core/Expressions/Processors/MinAggregator.cs index 9c426482..f2138c25 100644 --- a/src/Spring/Spring.Core/Expressions/Processors/MinAggregator.cs +++ b/src/Spring/Spring.Core/Expressions/Processors/MinAggregator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Spring.Util; diff --git a/src/Spring/Spring.Core/Expressions/Processors/NonNullProcessor.cs b/src/Spring/Spring.Core/Expressions/Processors/NonNullProcessor.cs index b03fc718..e2c2ba70 100644 --- a/src/Spring/Spring.Core/Expressions/Processors/NonNullProcessor.cs +++ b/src/Spring/Spring.Core/Expressions/Processors/NonNullProcessor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; namespace Spring.Expressions.Processors; diff --git a/src/Spring/Spring.Core/Expressions/Processors/OrderByProcessor.cs b/src/Spring/Spring.Core/Expressions/Processors/OrderByProcessor.cs index c473175f..1a490a88 100644 --- a/src/Spring/Spring.Core/Expressions/Processors/OrderByProcessor.cs +++ b/src/Spring/Spring.Core/Expressions/Processors/OrderByProcessor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Spring.Util; @@ -30,8 +26,6 @@ namespace Spring.Expressions.Processors; /// Erich Eichinger public class OrderByProcessor : ICollectionProcessor { - #region Comparer Helper Implementations - private class SimpleExpressionComparer : IComparer { private readonly IExpression _expression; @@ -99,8 +93,6 @@ public class OrderByProcessor : ICollectionProcessor } } - #endregion - /// /// Sorts the source collection using custom sort criteria. /// diff --git a/src/Spring/Spring.Core/Expressions/Processors/ReverseProcessor.cs b/src/Spring/Spring.Core/Expressions/Processors/ReverseProcessor.cs index 1d90feab..6edc4c07 100644 --- a/src/Spring/Spring.Core/Expressions/Processors/ReverseProcessor.cs +++ b/src/Spring/Spring.Core/Expressions/Processors/ReverseProcessor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; namespace Spring.Expressions.Processors; diff --git a/src/Spring/Spring.Core/Expressions/Processors/SortProcessor.cs b/src/Spring/Spring.Core/Expressions/Processors/SortProcessor.cs index 6ccffee6..37a3fa55 100644 --- a/src/Spring/Spring.Core/Expressions/Processors/SortProcessor.cs +++ b/src/Spring/Spring.Core/Expressions/Processors/SortProcessor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Spring.Collections; diff --git a/src/Spring/Spring.Core/Expressions/Processors/SumAggregator.cs b/src/Spring/Spring.Core/Expressions/Processors/SumAggregator.cs index cc3b673f..87b72639 100644 --- a/src/Spring/Spring.Core/Expressions/Processors/SumAggregator.cs +++ b/src/Spring/Spring.Core/Expressions/Processors/SumAggregator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Spring.Util; diff --git a/src/Spring/Spring.Core/Expressions/ProjectionNode.cs b/src/Spring/Spring.Core/Expressions/ProjectionNode.cs index d3b29508..651e91e3 100644 --- a/src/Spring/Spring.Core/Expressions/ProjectionNode.cs +++ b/src/Spring/Spring.Core/Expressions/ProjectionNode.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Runtime.Serialization; diff --git a/src/Spring/Spring.Core/Expressions/PropertyOrFieldNode.cs b/src/Spring/Spring.Core/Expressions/PropertyOrFieldNode.cs index fe031e0c..b141641d 100644 --- a/src/Spring/Spring.Core/Expressions/PropertyOrFieldNode.cs +++ b/src/Spring/Spring.Core/Expressions/PropertyOrFieldNode.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Reflection; using System.Runtime.CompilerServices; @@ -498,8 +494,6 @@ public class PropertyOrFieldNode : BaseNode //} } - #region IValueAccessor interface - private interface IValueAccessor { object Get(object context); @@ -513,10 +507,6 @@ public class PropertyOrFieldNode : BaseNode bool RequiresRefresh(Type contextType); } - #endregion - - #region BaseValueAccessor implementation - private abstract class BaseValueAccessor : IValueAccessor { public abstract object Get(object context); @@ -554,10 +544,6 @@ public class PropertyOrFieldNode : BaseNode } } - #endregion - - #region PropertyValueAccessor implementation - private class PropertyValueAccessor : BaseValueAccessor { private SafeProperty property; @@ -628,10 +614,6 @@ public class PropertyOrFieldNode : BaseNode } } - #endregion - - #region FieldValueAccessor implementation - private class FieldValueAccessor : BaseValueAccessor { private SafeField field; @@ -683,10 +665,6 @@ public class PropertyOrFieldNode : BaseNode } } - #endregion - - #region EnumValueAccessor implementation - private class EnumValueAccessor : BaseValueAccessor { private object enumValue; @@ -707,10 +685,6 @@ public class PropertyOrFieldNode : BaseNode } } - #endregion - - #region ExpandoObjectValueAccessor implementation - private class ExpandoObjectValueAccessor : BaseValueAccessor { private string memberName; @@ -739,10 +713,6 @@ public class PropertyOrFieldNode : BaseNode } } - #endregion - - #region DynamicObjectValueAccessor implementation - private class DynamicObjectValueAccessor : BaseValueAccessor { private string memberName; @@ -786,10 +756,6 @@ public class PropertyOrFieldNode : BaseNode } } - #endregion - - #region TypeValueAccessor implementation - private class TypeValueAccessor : BaseValueAccessor { private Type type; @@ -809,6 +775,4 @@ public class PropertyOrFieldNode : BaseNode throw new NotSupportedException("Cannot set the value of a type."); } } - - #endregion } diff --git a/src/Spring/Spring.Core/Expressions/QualifiedIdentifier.cs b/src/Spring/Spring.Core/Expressions/QualifiedIdentifier.cs index 65bbf1e3..f37f1cec 100644 --- a/src/Spring/Spring.Core/Expressions/QualifiedIdentifier.cs +++ b/src/Spring/Spring.Core/Expressions/QualifiedIdentifier.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using Spring.Expressions.Parser.antlr.collections; diff --git a/src/Spring/Spring.Core/Expressions/RealLiteralNode.cs b/src/Spring/Spring.Core/Expressions/RealLiteralNode.cs index 79aabd2b..b6149cc9 100644 --- a/src/Spring/Spring.Core/Expressions/RealLiteralNode.cs +++ b/src/Spring/Spring.Core/Expressions/RealLiteralNode.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using System.Runtime.Serialization; diff --git a/src/Spring/Spring.Core/Expressions/ReferenceNode.cs b/src/Spring/Spring.Core/Expressions/ReferenceNode.cs index 830e947c..c6615927 100644 --- a/src/Spring/Spring.Core/Expressions/ReferenceNode.cs +++ b/src/Spring/Spring.Core/Expressions/ReferenceNode.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Expressions; using Spring.Objects.Factory; using System.Runtime.Serialization; diff --git a/src/Spring/Spring.Core/Expressions/SelectionFirstNode.cs b/src/Spring/Spring.Core/Expressions/SelectionFirstNode.cs index 5fceeaff..de8e56be 100644 --- a/src/Spring/Spring.Core/Expressions/SelectionFirstNode.cs +++ b/src/Spring/Spring.Core/Expressions/SelectionFirstNode.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Runtime.Serialization; diff --git a/src/Spring/Spring.Core/Expressions/SelectionLastNode.cs b/src/Spring/Spring.Core/Expressions/SelectionLastNode.cs index fa42075c..68e19824 100644 --- a/src/Spring/Spring.Core/Expressions/SelectionLastNode.cs +++ b/src/Spring/Spring.Core/Expressions/SelectionLastNode.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Runtime.Serialization; diff --git a/src/Spring/Spring.Core/Expressions/SelectionNode.cs b/src/Spring/Spring.Core/Expressions/SelectionNode.cs index 88679965..c7fb35b6 100644 --- a/src/Spring/Spring.Core/Expressions/SelectionNode.cs +++ b/src/Spring/Spring.Core/Expressions/SelectionNode.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Runtime.Serialization; diff --git a/src/Spring/Spring.Core/Expressions/SpringAST.cs b/src/Spring/Spring.Core/Expressions/SpringAST.cs index cac1dc2b..5acd7c0d 100644 --- a/src/Spring/Spring.Core/Expressions/SpringAST.cs +++ b/src/Spring/Spring.Core/Expressions/SpringAST.cs @@ -18,8 +18,6 @@ namespace Spring.Expressions; [Serializable] public class SpringAST : Parser.antlr.BaseAST, ISerializable { - #region Global SpringAST Factory - internal class SpringASTCreator : Parser.antlr.ASTNodeCreator { public override Parser.antlr.collections.AST Create() @@ -38,15 +36,9 @@ public class SpringAST : Parser.antlr.BaseAST, ISerializable /// internal static readonly SpringASTCreator Creator = new SpringASTCreator(); - #endregion - - #region Members - private string text; private int ttype; - #endregion - /// /// Create an instance /// @@ -123,8 +115,6 @@ public class SpringAST : Parser.antlr.BaseAST, ISerializable return this.text; } - #region ISerializable Implementation - /// /// Create a new instance from SerializationInfo /// @@ -146,6 +136,4 @@ public class SpringAST : Parser.antlr.BaseAST, ISerializable info.AddValue("ttype", this.Type, typeof(int)); info.AddValue("text", this.Text, typeof(string)); } - - #endregion } diff --git a/src/Spring/Spring.Core/Expressions/StringLiteralNode.cs b/src/Spring/Spring.Core/Expressions/StringLiteralNode.cs index 6ebdcabb..caf069bd 100644 --- a/src/Spring/Spring.Core/Expressions/StringLiteralNode.cs +++ b/src/Spring/Spring.Core/Expressions/StringLiteralNode.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Expressions; diff --git a/src/Spring/Spring.Core/Expressions/SyntaxErrorException.cs b/src/Spring/Spring.Core/Expressions/SyntaxErrorException.cs index 1689d0bf..91dcec63 100644 --- a/src/Spring/Spring.Core/Expressions/SyntaxErrorException.cs +++ b/src/Spring/Spring.Core/Expressions/SyntaxErrorException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using Spring.Expressions.Parser.antlr; @@ -65,8 +61,6 @@ internal class SyntaxErrorException : RecognitionException, ISerializable get { return _expression; } } - #region Public Instance Constructors - /// /// TODO /// @@ -76,10 +70,6 @@ internal class SyntaxErrorException : RecognitionException, ISerializable _expression = expression; } - #endregion Public Instance Constructors - - #region Protected Instance Constructors - /// /// TODO /// @@ -105,6 +95,4 @@ internal class SyntaxErrorException : RecognitionException, ISerializable info.AddValue("Message", base.Message); info.AddValue("Expression", this._expression); } - - #endregion Protected Instance Constructors } diff --git a/src/Spring/Spring.Core/Expressions/TernaryNode.cs b/src/Spring/Spring.Core/Expressions/TernaryNode.cs index 5a63c5d6..58110870 100644 --- a/src/Spring/Spring.Core/Expressions/TernaryNode.cs +++ b/src/Spring/Spring.Core/Expressions/TernaryNode.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using Spring.Expressions.Parser.antlr.collections; diff --git a/src/Spring/Spring.Core/Expressions/TypeNode.cs b/src/Spring/Spring.Core/Expressions/TypeNode.cs index 4a1b4d60..6ecaea12 100644 --- a/src/Spring/Spring.Core/Expressions/TypeNode.cs +++ b/src/Spring/Spring.Core/Expressions/TypeNode.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using Spring.Core.TypeResolution; using Spring.Expressions.Parser.antlr.collections; diff --git a/src/Spring/Spring.Core/Expressions/UnaryOperator.cs b/src/Spring/Spring.Core/Expressions/UnaryOperator.cs index 2cc090d0..202c315f 100644 --- a/src/Spring/Spring.Core/Expressions/UnaryOperator.cs +++ b/src/Spring/Spring.Core/Expressions/UnaryOperator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Expressions; diff --git a/src/Spring/Spring.Core/Expressions/VariableNode.cs b/src/Spring/Spring.Core/Expressions/VariableNode.cs index c391919f..08705a7e 100644 --- a/src/Spring/Spring.Core/Expressions/VariableNode.cs +++ b/src/Spring/Spring.Core/Expressions/VariableNode.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Expressions; diff --git a/src/Spring/Spring.Core/Globalization/AbstractLocalizer.cs b/src/Spring/Spring.Core/Globalization/AbstractLocalizer.cs index dd31b454..94d8f8ed 100644 --- a/src/Spring/Spring.Core/Globalization/AbstractLocalizer.cs +++ b/src/Spring/Spring.Core/Globalization/AbstractLocalizer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using System.Threading; using Spring.Context; diff --git a/src/Spring/Spring.Core/Globalization/AbstractResourceCache.cs b/src/Spring/Spring.Core/Globalization/AbstractResourceCache.cs index 843488b8..e25e5e30 100644 --- a/src/Spring/Spring.Core/Globalization/AbstractResourceCache.cs +++ b/src/Spring/Spring.Core/Globalization/AbstractResourceCache.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; namespace Spring.Globalization; diff --git a/src/Spring/Spring.Core/Globalization/Formatters/BooleanFormatter.cs b/src/Spring/Spring.Core/Globalization/Formatters/BooleanFormatter.cs index df2257a8..24e7365e 100644 --- a/src/Spring/Spring.Core/Globalization/Formatters/BooleanFormatter.cs +++ b/src/Spring/Spring.Core/Globalization/Formatters/BooleanFormatter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Util; namespace Spring.Globalization.Formatters; @@ -33,8 +29,6 @@ public class BooleanFormatter : IFormatter private string falseString; private bool ignoreCase; - #region Constructors - /// /// Initializes a new instance of the class /// using default values @@ -54,10 +48,6 @@ public class BooleanFormatter : IFormatter this.ignoreCase = ignoreCase; } - #endregion - - #region Properties - /// /// Set/Get value to control casesensitivity of /// @@ -94,8 +84,6 @@ public class BooleanFormatter : IFormatter set { this.falseString = value; } } - #endregion - /// /// Formats the specified boolean value. /// diff --git a/src/Spring/Spring.Core/Globalization/Formatters/CurrencyFormatter.cs b/src/Spring/Spring.Core/Globalization/Formatters/CurrencyFormatter.cs index 3347544c..2203f826 100644 --- a/src/Spring/Spring.Core/Globalization/Formatters/CurrencyFormatter.cs +++ b/src/Spring/Spring.Core/Globalization/Formatters/CurrencyFormatter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using Spring.Util; @@ -47,8 +43,6 @@ public class CurrencyFormatter : IFormatter { private NumberFormatInfo formatInfo; - #region Constructors - /// /// Initializes a new instance of the class /// using default for the current thread's culture. @@ -89,10 +83,6 @@ public class CurrencyFormatter : IFormatter this.formatInfo = formatInfo; } - #endregion - - #region Properties - /// /// Gets or sets the currency decimal digits. /// @@ -170,8 +160,6 @@ public class CurrencyFormatter : IFormatter set { formatInfo.CurrencyPositivePattern = value; } } - #endregion - /// /// Formats the specified currency value. /// diff --git a/src/Spring/Spring.Core/Globalization/Formatters/DateTimeFormatter.cs b/src/Spring/Spring.Core/Globalization/Formatters/DateTimeFormatter.cs index 41ef56a1..01f91e2e 100644 --- a/src/Spring/Spring.Core/Globalization/Formatters/DateTimeFormatter.cs +++ b/src/Spring/Spring.Core/Globalization/Formatters/DateTimeFormatter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using Spring.Util; @@ -48,8 +44,6 @@ public class DateTimeFormatter : IFormatter private DateTimeFormatInfo formatInfo; private string format; - #region Constructors - /// /// Initializes a new instance of the class /// using default for the current thread's culture. @@ -81,8 +75,6 @@ public class DateTimeFormatter : IFormatter this.formatInfo = culture.DateTimeFormat; } - #endregion - /// /// Formats the specified value. /// diff --git a/src/Spring/Spring.Core/Globalization/Formatters/FilteringFormatter.cs b/src/Spring/Spring.Core/Globalization/Formatters/FilteringFormatter.cs index 10bdde8d..f5c704a0 100644 --- a/src/Spring/Spring.Core/Globalization/Formatters/FilteringFormatter.cs +++ b/src/Spring/Spring.Core/Globalization/Formatters/FilteringFormatter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Globalization.Formatters; /// diff --git a/src/Spring/Spring.Core/Globalization/Formatters/FloatFormatter.cs b/src/Spring/Spring.Core/Globalization/Formatters/FloatFormatter.cs index 30e38220..c97ffa54 100644 --- a/src/Spring/Spring.Core/Globalization/Formatters/FloatFormatter.cs +++ b/src/Spring/Spring.Core/Globalization/Formatters/FloatFormatter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using Spring.Util; @@ -45,8 +41,6 @@ public class FloatFormatter : IFormatter private string format; private NumberFormatInfo numberInfo; - #region Constructors - /// /// Initializes a new instance of the class, /// using default format string of '{0:F}' and current thread's culture. @@ -95,8 +89,6 @@ public class FloatFormatter : IFormatter this.numberInfo = culture.NumberFormat; } - #endregion - /// /// Formats the specified float value. /// diff --git a/src/Spring/Spring.Core/Globalization/Formatters/HasTextFilteringFormatter.cs b/src/Spring/Spring.Core/Globalization/Formatters/HasTextFilteringFormatter.cs index 24d82daa..853c1a20 100644 --- a/src/Spring/Spring.Core/Globalization/Formatters/HasTextFilteringFormatter.cs +++ b/src/Spring/Spring.Core/Globalization/Formatters/HasTextFilteringFormatter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Util; namespace Spring.Globalization.Formatters; diff --git a/src/Spring/Spring.Core/Globalization/Formatters/IntegerFormatter.cs b/src/Spring/Spring.Core/Globalization/Formatters/IntegerFormatter.cs index 628a6a07..a7ec32a0 100644 --- a/src/Spring/Spring.Core/Globalization/Formatters/IntegerFormatter.cs +++ b/src/Spring/Spring.Core/Globalization/Formatters/IntegerFormatter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using Spring.Util; @@ -39,8 +35,6 @@ public class IntegerFormatter : IFormatter { private string format = "{0:D}"; - #region Constructors - /// /// Initializes a new instance of the class, /// using default format string of '{0:D}'. @@ -58,8 +52,6 @@ public class IntegerFormatter : IFormatter this.format = format; } - #endregion - /// /// Formats the specified integer value. /// diff --git a/src/Spring/Spring.Core/Globalization/Formatters/NullFormatter.cs b/src/Spring/Spring.Core/Globalization/Formatters/NullFormatter.cs index 7f5c1793..8476341f 100644 --- a/src/Spring/Spring.Core/Globalization/Formatters/NullFormatter.cs +++ b/src/Spring/Spring.Core/Globalization/Formatters/NullFormatter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Globalization.Formatters; /// @@ -29,8 +25,6 @@ namespace Spring.Globalization.Formatters; /// Erich Eichinger public class NullFormatter : IFormatter { - #region Constructors - /// /// Initializes a new instance of the class. /// @@ -38,8 +32,6 @@ public class NullFormatter : IFormatter { } - #endregion - /// /// Converts the passed value to a string by calling . /// diff --git a/src/Spring/Spring.Core/Globalization/Formatters/NumberFormatter.cs b/src/Spring/Spring.Core/Globalization/Formatters/NumberFormatter.cs index 107ff215..9498974f 100644 --- a/src/Spring/Spring.Core/Globalization/Formatters/NumberFormatter.cs +++ b/src/Spring/Spring.Core/Globalization/Formatters/NumberFormatter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using Spring.Util; @@ -53,8 +49,6 @@ public class NumberFormatter : IFormatter { private NumberFormatInfo formatInfo; - #region Constructors - /// /// Initializes a new instance of the class /// using default for the current thread's culture. @@ -95,10 +89,6 @@ public class NumberFormatter : IFormatter this.formatInfo = formatInfo; } - #endregion - - #region Properties - /// /// Gets or sets the number of decimal digits. /// @@ -154,8 +144,6 @@ public class NumberFormatter : IFormatter set { formatInfo.NumberNegativePattern = value; } } - #endregion - /// /// Formats the specified number value. /// diff --git a/src/Spring/Spring.Core/Globalization/Formatters/PercentFormatter.cs b/src/Spring/Spring.Core/Globalization/Formatters/PercentFormatter.cs index 1e93dd1d..8e9a6788 100644 --- a/src/Spring/Spring.Core/Globalization/Formatters/PercentFormatter.cs +++ b/src/Spring/Spring.Core/Globalization/Formatters/PercentFormatter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using Spring.Util; @@ -50,8 +46,6 @@ public class PercentFormatter : IFormatter private NumberFormatInfo formatInfo; - #region Constructors - /// /// Initializes a new instance of the class /// using default for the current thread's culture. @@ -92,10 +86,6 @@ public class PercentFormatter : IFormatter this.formatInfo = formatInfo; } - #endregion - - #region Properties - /// /// Gets or sets the number of decimal digits. /// @@ -184,8 +174,6 @@ public class PercentFormatter : IFormatter set { formatInfo.PerMilleSymbol = value; } } - #endregion - /// /// Formats the specified percentage value. /// diff --git a/src/Spring/Spring.Core/Globalization/ICultureResolver.cs b/src/Spring/Spring.Core/Globalization/ICultureResolver.cs index 11e807a7..381e0b01 100644 --- a/src/Spring/Spring.Core/Globalization/ICultureResolver.cs +++ b/src/Spring/Spring.Core/Globalization/ICultureResolver.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; namespace Spring.Globalization; diff --git a/src/Spring/Spring.Core/Globalization/IFormatter.cs b/src/Spring/Spring.Core/Globalization/IFormatter.cs index 6d05456f..842d78d0 100644 --- a/src/Spring/Spring.Core/Globalization/IFormatter.cs +++ b/src/Spring/Spring.Core/Globalization/IFormatter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Globalization; /// diff --git a/src/Spring/Spring.Core/Globalization/ILocalizer.cs b/src/Spring/Spring.Core/Globalization/ILocalizer.cs index 64223690..d0cc558d 100644 --- a/src/Spring/Spring.Core/Globalization/ILocalizer.cs +++ b/src/Spring/Spring.Core/Globalization/ILocalizer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using Spring.Context; diff --git a/src/Spring/Spring.Core/Globalization/IResourceCache.cs b/src/Spring/Spring.Core/Globalization/IResourceCache.cs index 460da2e0..9f89f007 100644 --- a/src/Spring/Spring.Core/Globalization/IResourceCache.cs +++ b/src/Spring/Spring.Core/Globalization/IResourceCache.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; namespace Spring.Globalization; diff --git a/src/Spring/Spring.Core/Globalization/Localizers/ResourceSetLocalizer.cs b/src/Spring/Spring.Core/Globalization/Localizers/ResourceSetLocalizer.cs index 09b3d3d5..e1b53990 100644 --- a/src/Spring/Spring.Core/Globalization/Localizers/ResourceSetLocalizer.cs +++ b/src/Spring/Spring.Core/Globalization/Localizers/ResourceSetLocalizer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Globalization; using System.Resources; diff --git a/src/Spring/Spring.Core/Globalization/NullResourceCache.cs b/src/Spring/Spring.Core/Globalization/NullResourceCache.cs index 41cb15e9..4f5ec6a7 100644 --- a/src/Spring/Spring.Core/Globalization/NullResourceCache.cs +++ b/src/Spring/Spring.Core/Globalization/NullResourceCache.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Globalization; /// diff --git a/src/Spring/Spring.Core/Globalization/Resolvers/DefaultCultureResolver.cs b/src/Spring/Spring.Core/Globalization/Resolvers/DefaultCultureResolver.cs index 1463e1cb..8f7ae6dc 100644 --- a/src/Spring/Spring.Core/Globalization/Resolvers/DefaultCultureResolver.cs +++ b/src/Spring/Spring.Core/Globalization/Resolvers/DefaultCultureResolver.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using System.Threading; diff --git a/src/Spring/Spring.Core/Globalization/Resource.cs b/src/Spring/Spring.Core/Globalization/Resource.cs index f9fc09a4..220f9aa5 100644 --- a/src/Spring/Spring.Core/Globalization/Resource.cs +++ b/src/Spring/Spring.Core/Globalization/Resource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Expressions; namespace Spring.Globalization; diff --git a/src/Spring/Spring.Core/LogManager.cs b/src/Spring/Spring.Core/LogManager.cs index dce1f3cc..02bd9d95 100644 --- a/src/Spring/Spring.Core/LogManager.cs +++ b/src/Spring/Spring.Core/LogManager.cs @@ -1,5 +1,3 @@ -#region License - // /* // * Copyright 2018 the original author or authors. // * @@ -16,8 +14,6 @@ // * limitations under the License. // */ -#endregion - using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; diff --git a/src/Spring/Spring.Core/Objects/Events/IEventRegistry.cs b/src/Spring/Spring.Core/Objects/Events/IEventRegistry.cs index b560d1b0..4a08cdc7 100644 --- a/src/Spring/Spring.Core/Objects/Events/IEventRegistry.cs +++ b/src/Spring/Spring.Core/Objects/Events/IEventRegistry.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Events; /// diff --git a/src/Spring/Spring.Core/Objects/Events/IEventRegistryAware.cs b/src/Spring/Spring.Core/Objects/Events/IEventRegistryAware.cs index ab5f1aca..642f5f94 100644 --- a/src/Spring/Spring.Core/Objects/Events/IEventRegistryAware.cs +++ b/src/Spring/Spring.Core/Objects/Events/IEventRegistryAware.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Events; /// diff --git a/src/Spring/Spring.Core/Objects/Events/Support/EventManipulationUtils.cs b/src/Spring/Spring.Core/Objects/Events/Support/EventManipulationUtils.cs index b91ae0f5..74a1e9ae 100644 --- a/src/Spring/Spring.Core/Objects/Events/Support/EventManipulationUtils.cs +++ b/src/Spring/Spring.Core/Objects/Events/Support/EventManipulationUtils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using Spring.Core; using Spring.Util; @@ -93,10 +89,6 @@ public sealed class EventManipulationUtils return null; } - #region Constructor (s) / Destructor - - // CLOVER:OFF - /// /// Creates a new instance of the EventManipulationUtilities class. /// @@ -110,6 +102,4 @@ public sealed class EventManipulationUtils } // CLOVER:ON - - #endregion } diff --git a/src/Spring/Spring.Core/Objects/Events/Support/EventRegistry.cs b/src/Spring/Spring.Core/Objects/Events/Support/EventRegistry.cs index d40da42a..4c2087e4 100644 --- a/src/Spring/Spring.Core/Objects/Events/Support/EventRegistry.cs +++ b/src/Spring/Spring.Core/Objects/Events/Support/EventRegistry.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; namespace Spring.Objects.Events.Support; diff --git a/src/Spring/Spring.Core/Objects/Factory/Attributes/AutowiredAttribute.cs b/src/Spring/Spring.Core/Objects/Factory/Attributes/AutowiredAttribute.cs index 505393f3..7aa10c13 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Attributes/AutowiredAttribute.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Attributes/AutowiredAttribute.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory.Attributes; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Attributes/AutowiredAttributeObjectPostProcessor.cs b/src/Spring/Spring.Core/Objects/Factory/Attributes/AutowiredAttributeObjectPostProcessor.cs index 39d00d6e..c451e676 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Attributes/AutowiredAttributeObjectPostProcessor.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Attributes/AutowiredAttributeObjectPostProcessor.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using Microsoft.Extensions.Logging; using Spring.Collections; diff --git a/src/Spring/Spring.Core/Objects/Factory/Attributes/InitDestroyAttributeObjectPostProcessor.cs b/src/Spring/Spring.Core/Objects/Factory/Attributes/InitDestroyAttributeObjectPostProcessor.cs index 5a3d9a66..b0be53e6 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Attributes/InitDestroyAttributeObjectPostProcessor.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Attributes/InitDestroyAttributeObjectPostProcessor.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using Microsoft.Extensions.Logging; using Spring.Objects.Factory.Config; diff --git a/src/Spring/Spring.Core/Objects/Factory/Attributes/InjectionMetadata.cs b/src/Spring/Spring.Core/Objects/Factory/Attributes/InjectionMetadata.cs index 48f0b0a3..97226f6f 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Attributes/InjectionMetadata.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Attributes/InjectionMetadata.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using Microsoft.Extensions.Logging; using Spring.Objects.Factory.Support; diff --git a/src/Spring/Spring.Core/Objects/Factory/Attributes/PostConstructAttribute.cs b/src/Spring/Spring.Core/Objects/Factory/Attributes/PostConstructAttribute.cs index 6f8a1826..ffb1d41f 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Attributes/PostConstructAttribute.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Attributes/PostConstructAttribute.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory.Attributes; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Attributes/PreDestroyAttribute.cs b/src/Spring/Spring.Core/Objects/Factory/Attributes/PreDestroyAttribute.cs index 7295bf60..62389002 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Attributes/PreDestroyAttribute.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Attributes/PreDestroyAttribute.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory.Attributes; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Attributes/QualifierAnnotationAutowireCandidateResolver.cs b/src/Spring/Spring.Core/Objects/Factory/Attributes/QualifierAnnotationAutowireCandidateResolver.cs index 33c185f5..a25830bb 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Attributes/QualifierAnnotationAutowireCandidateResolver.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Attributes/QualifierAnnotationAutowireCandidateResolver.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using Spring.Core; using Spring.Core.TypeConversion; diff --git a/src/Spring/Spring.Core/Objects/Factory/Attributes/RequiredAttribute.cs b/src/Spring/Spring.Core/Objects/Factory/Attributes/RequiredAttribute.cs index 21abe6b8..0098c597 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Attributes/RequiredAttribute.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Attributes/RequiredAttribute.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory.Attributes; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Attributes/RequiredAttributeObjectPostProcessor.cs b/src/Spring/Spring.Core/Objects/Factory/Attributes/RequiredAttributeObjectPostProcessor.cs index e97142df..abf4baab 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Attributes/RequiredAttributeObjectPostProcessor.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Attributes/RequiredAttributeObjectPostProcessor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using System.Text; using Spring.Collections; diff --git a/src/Spring/Spring.Core/Objects/Factory/Attributes/ValueAttribute.cs b/src/Spring/Spring.Core/Objects/Factory/Attributes/ValueAttribute.cs index 6ca009c3..1982c5c7 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Attributes/ValueAttribute.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Attributes/ValueAttribute.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory.Attributes; [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter)] diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/AbstractConfigurer.cs b/src/Spring/Spring.Core/Objects/Factory/Config/AbstractConfigurer.cs index 311e8b53..c01d8992 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/AbstractConfigurer.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/AbstractConfigurer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Core; using Spring.Core.TypeResolution; diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/AbstractFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/AbstractFactoryObject.cs index df456f0d..f86f1f9f 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/AbstractFactoryObject.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/AbstractFactoryObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory.Config; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/AutoWiringMode.cs b/src/Spring/Spring.Core/Objects/Factory/Config/AutoWiringMode.cs index 9f5c408d..74d5ea89 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/AutoWiringMode.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/AutoWiringMode.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory.Config; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/CommandLineArgsVariableSource.cs b/src/Spring/Spring.Core/Objects/Factory/Config/CommandLineArgsVariableSource.cs index 97c2ba6b..4365bb89 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/CommandLineArgsVariableSource.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/CommandLineArgsVariableSource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory.Config; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ConfigSectionVariableSource.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ConfigSectionVariableSource.cs index cc70d727..1bda2a07 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/ConfigSectionVariableSource.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/ConfigSectionVariableSource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections.Specialized; using System.Configuration; using Spring.Util; diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ConfigurableVariableSource.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ConfigurableVariableSource.cs index 79a7dd63..0e097a75 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/ConfigurableVariableSource.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/ConfigurableVariableSource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections.Specialized; namespace Spring.Objects.Factory.Config; diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ConfigurationReader.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ConfigurationReader.cs index ba0e589b..2530e65f 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/ConfigurationReader.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/ConfigurationReader.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections.Specialized; using System.Configuration; using System.Reflection; @@ -471,10 +467,6 @@ public sealed class ConfigurationReader } } - #region Constructor (s) / Destructor - - // CLOVER:OFF - /// /// Creates a new instance of the ConfigurationReader class. /// @@ -489,6 +481,4 @@ public sealed class ConfigurationReader } // CLOVER:ON - - #endregion } diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ConnectionStringsVariableSource.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ConnectionStringsVariableSource.cs index 35d1171b..aca57c6b 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/ConnectionStringsVariableSource.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/ConnectionStringsVariableSource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Configuration; using Spring.Util; diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/CustomConverterConfigurer.cs b/src/Spring/Spring.Core/Objects/Factory/Config/CustomConverterConfigurer.cs index 130103d5..2750adb7 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/CustomConverterConfigurer.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/CustomConverterConfigurer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.ComponentModel; diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/DelegateFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/DelegateFactoryObject.cs index 17313e51..4994595d 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/DelegateFactoryObject.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/DelegateFactoryObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Util; namespace Spring.Objects.Factory.Config; @@ -102,8 +98,6 @@ public class DelegateFactoryObject : AbstractFactoryObject return instance; } - #region Properties - /// /// The of /// created by this factory. @@ -165,14 +159,8 @@ public class DelegateFactoryObject : AbstractFactoryObject set { _targetObject = value; } } - #endregion - - #region Fields - private Type _delegateType; private string _methodName; private Type _targetType; private object _targetObject; - - #endregion } diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/DelegateObjectFactoryConfigurer.cs b/src/Spring/Spring.Core/Objects/Factory/Config/DelegateObjectFactoryConfigurer.cs index 4762912f..7a90fc87 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/DelegateObjectFactoryConfigurer.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/DelegateObjectFactoryConfigurer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory.Config; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/DependencyDescriptor.cs b/src/Spring/Spring.Core/Objects/Factory/Config/DependencyDescriptor.cs index af0f7885..ca62d503 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/DependencyDescriptor.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/DependencyDescriptor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Core; using System.Reflection; diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/DictionaryFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/DictionaryFactoryObject.cs index 31987e00..90a20dd9 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/DictionaryFactoryObject.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/DictionaryFactoryObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Globalization; using Spring.Util; diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/DictionaryVariableSource.cs b/src/Spring/Spring.Core/Objects/Factory/Config/DictionaryVariableSource.cs index e817002c..67b74162 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/DictionaryVariableSource.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/DictionaryVariableSource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; namespace Spring.Objects.Factory.Config; diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/EnvironmentVariableMode.cs b/src/Spring/Spring.Core/Objects/Factory/Config/EnvironmentVariableMode.cs index 41ecc999..828ada94 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/EnvironmentVariableMode.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/EnvironmentVariableMode.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory.Config; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/EnvironmentVariableSource.cs b/src/Spring/Spring.Core/Objects/Factory/Config/EnvironmentVariableSource.cs index c738ede2..170adff0 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/EnvironmentVariableSource.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/EnvironmentVariableSource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory.Config; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/FieldRetrievingFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/FieldRetrievingFactoryObject.cs index 3aefa831..ebbf27c8 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/FieldRetrievingFactoryObject.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/FieldRetrievingFactoryObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using System.Reflection; using System.Text; diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/IAutowireCapableObjectFactory.cs b/src/Spring/Spring.Core/Objects/Factory/Config/IAutowireCapableObjectFactory.cs index 9af33310..1a5a500f 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/IAutowireCapableObjectFactory.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/IAutowireCapableObjectFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory.Config; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/IConfigurableFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/IConfigurableFactoryObject.cs index 96124008..41c4243c 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/IConfigurableFactoryObject.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/IConfigurableFactoryObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Objects.Factory.Config; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/IConfigurableListableObjectFactory.cs b/src/Spring/Spring.Core/Objects/Factory/Config/IConfigurableListableObjectFactory.cs index f480bff3..8a4aa0b9 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/IConfigurableListableObjectFactory.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/IConfigurableListableObjectFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory.Config; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/IConfigurableObjectFactory.cs b/src/Spring/Spring.Core/Objects/Factory/Config/IConfigurableObjectFactory.cs index c6d1206f..0d19d7c1 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/IConfigurableObjectFactory.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/IConfigurableObjectFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.ComponentModel; using Spring.Util; diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ICustomValueReferenceHolder.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ICustomValueReferenceHolder.cs index 57995261..66c466e5 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/ICustomValueReferenceHolder.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/ICustomValueReferenceHolder.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory.Config; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/IDestructionAwareObjectPostProcessor.cs b/src/Spring/Spring.Core/Objects/Factory/Config/IDestructionAwareObjectPostProcessor.cs index cdd490d1..36a25c9e 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/IDestructionAwareObjectPostProcessor.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/IDestructionAwareObjectPostProcessor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory.Config; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/IInstantiationAwareObjectPostProcessor.cs b/src/Spring/Spring.Core/Objects/Factory/Config/IInstantiationAwareObjectPostProcessor.cs index 893a249a..604ed3de 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/IInstantiationAwareObjectPostProcessor.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/IInstantiationAwareObjectPostProcessor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; namespace Spring.Objects.Factory.Config; diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/IManagedCollection.cs b/src/Spring/Spring.Core/Objects/Factory/Config/IManagedCollection.cs index 7193eb96..3eeb37b7 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/IManagedCollection.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/IManagedCollection.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; namespace Spring.Objects.Factory.Config; diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/IObjectDefinition.cs b/src/Spring/Spring.Core/Objects/Factory/Config/IObjectDefinition.cs index bc74e562..dee8c033 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/IObjectDefinition.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/IObjectDefinition.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory.Config; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/IObjectFactoryPostProcessor.cs b/src/Spring/Spring.Core/Objects/Factory/Config/IObjectFactoryPostProcessor.cs index e364e5de..9407d593 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/IObjectFactoryPostProcessor.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/IObjectFactoryPostProcessor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory.Config; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/IObjectPostProcessor.cs b/src/Spring/Spring.Core/Objects/Factory/Config/IObjectPostProcessor.cs index 712804ef..ca28ab8c 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/IObjectPostProcessor.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/IObjectPostProcessor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory.Config; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ISingletonObjectRegistry.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ISingletonObjectRegistry.cs index e89c143e..9c13b4cb 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/ISingletonObjectRegistry.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/ISingletonObjectRegistry.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects.Factory.Support; namespace Spring.Objects.Factory.Config; diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/IVariableSource.cs b/src/Spring/Spring.Core/Objects/Factory/Config/IVariableSource.cs index 3f0d823e..7284f88c 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/IVariableSource.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/IVariableSource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory.Config; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ListFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ListFactoryObject.cs index 8d908c8e..862a882f 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/ListFactoryObject.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/ListFactoryObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Globalization; using Spring.Util; @@ -35,8 +31,6 @@ public class ListFactoryObject : AbstractFactoryObject private IList _sourceList; private Type _targetListType = typeof(ArrayList); - #region Properties - /// /// Set the source . /// @@ -104,8 +98,6 @@ public class ListFactoryObject : AbstractFactoryObject get { return typeof(IList); } } - #endregion - /// /// Constructs a new instance of the target dictionary. /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/LogFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/LogFactoryObject.cs index 431baf0f..25f7e5f4 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/LogFactoryObject.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/LogFactoryObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using Spring.Util; @@ -41,8 +37,6 @@ namespace Spring.Objects.Factory.Config; [Serializable] public class LogFactoryObject : IFactoryObject, IInitializingObject { - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// @@ -70,8 +64,6 @@ public class LogFactoryObject : IFactoryObject, IInitializingObject LogName = logName; } - #endregion - /// /// The name of the instance served up by /// this factory. diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ManagedDictionary.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ManagedDictionary.cs index 2e3be288..db395f63 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/ManagedDictionary.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/ManagedDictionary.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -36,8 +30,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Collections.Specialized; using System.Globalization; diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ManagedList.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ManagedList.cs index b93d91e0..1761213f 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/ManagedList.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/ManagedList.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Globalization; using Spring.Core; diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ManagedNameValueCollection.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ManagedNameValueCollection.cs index 14e0dcc0..48c305f1 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/ManagedNameValueCollection.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/ManagedNameValueCollection.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections.Specialized; namespace Spring.Objects.Factory.Config; diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ManagedSet.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ManagedSet.cs index ec42a82f..a4801f38 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/ManagedSet.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/ManagedSet.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Spring.Collections; using Spring.Core; diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/MethodInvokingFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/MethodInvokingFactoryObject.cs index 2357c13c..21cabd24 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/MethodInvokingFactoryObject.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/MethodInvokingFactoryObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects.Support; namespace Spring.Objects.Factory.Config; diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ObjectDefinitionVisitor.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ObjectDefinitionVisitor.cs index 1ef1bc13..0e7de302 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/ObjectDefinitionVisitor.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/ObjectDefinitionVisitor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Collections.Specialized; using Spring.Collections; diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ObjectFactoryCreatingFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ObjectFactoryCreatingFactoryObject.cs index 5609b019..5ad110d5 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/ObjectFactoryCreatingFactoryObject.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/ObjectFactoryCreatingFactoryObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Util; namespace Spring.Objects.Factory.Config; @@ -77,8 +73,6 @@ public class ObjectFactoryCreatingFactoryObject private string _targetObjectName; private IObjectFactory _objectFactory; - #region Properties - /// /// Sets the name of the target object. /// @@ -113,8 +107,6 @@ public class ObjectFactoryCreatingFactoryObject get { return typeof(IGenericObjectFactory); } } - #endregion - /// /// Returns an instance of the object factory. /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ObjectReferenceFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ObjectReferenceFactoryObject.cs index fdee018c..c36184ad 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/ObjectReferenceFactoryObject.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/ObjectReferenceFactoryObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Util; namespace Spring.Objects.Factory.Config; diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ObjectRole.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ObjectRole.cs index 714d9aed..788b5ef1 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/ObjectRole.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/ObjectRole.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory.Config; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/PropertyFileVariableSource.cs b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyFileVariableSource.cs index 2e2b4477..23245ba7 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/PropertyFileVariableSource.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyFileVariableSource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Core.IO; using Spring.Util; diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/PropertyOverrideConfigurer.cs b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyOverrideConfigurer.cs index 35bf1fbb..346d25b2 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/PropertyOverrideConfigurer.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyOverrideConfigurer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections.Specialized; using System.Globalization; using Microsoft.Extensions.Logging; @@ -173,25 +169,17 @@ public class PropertyOverrideConfigurer : PropertyResourceConfigurer } else { - #region Instrumentation - if (_logger.IsEnabled(LogLevel.Warning)) { _logger.LogWarning(string.Format(CultureInfo.InvariantCulture, "Cannot find object '{0}' when overriding properties; check configuration.", name)); } - - #endregion } - #region Instrumentation - if (_logger.IsEnabled(LogLevel.Debug)) { _logger.LogDebug(string.Format(CultureInfo.InvariantCulture, "Property '{0}' set to '{1}'.", key, value)); } - - #endregion } } diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/PropertyPathFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyPathFactoryObject.cs index 43a63e90..977eee4e 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/PropertyPathFactoryObject.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyPathFactoryObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory.Config; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/PropertyPlaceholderConfigurer.cs b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyPlaceholderConfigurer.cs index 92d409f9..ff9626f0 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/PropertyPlaceholderConfigurer.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyPlaceholderConfigurer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections.Specialized; using System.Globalization; using Microsoft.Extensions.Logging; @@ -161,8 +157,6 @@ public class PropertyPlaceholderConfigurer : PropertyResourceConfigurer logger = LogManager.GetLogger(this.GetType()); } - #region Properties - /// /// The placeholder prefix (the default is ${). /// @@ -211,8 +205,6 @@ public class PropertyPlaceholderConfigurer : PropertyResourceConfigurer set { includeAncestors = value; } } - #endregion - /// /// Apply the given properties to the supplied /// . @@ -299,8 +291,6 @@ public class PropertyPlaceholderConfigurer : PropertyResourceConfigurer { resolvedValue = ParseString(properties, resolvedValue, visitedPlaceholders); - #region Instrumentation - if (logger.IsEnabled(LogLevel.Debug)) { logger.LogDebug(string.Format( @@ -308,8 +298,6 @@ public class PropertyPlaceholderConfigurer : PropertyResourceConfigurer "Resolving placeholder '{0}' to '{1}'.", placeholder, resolvedValue)); } - #endregion - strVal = strVal.Substring(0, startIndex) + resolvedValue + strVal.Substring(endIndex + 1); startIndex = strVal.IndexOf(placeholderPrefix, startIndex + resolvedValue.Length); } @@ -407,8 +395,6 @@ public class PropertyPlaceholderConfigurer : PropertyResourceConfigurer return props[placeholder]; } - #region Helper class - private class PlaceholderResolveHandlerAdapter : IStringValueResolver { private readonly PropertyPlaceholderConfigurer ppc; @@ -425,6 +411,4 @@ public class PropertyPlaceholderConfigurer : PropertyResourceConfigurer return ppc.ParseString(props, name, new HashedSet()); } } - - #endregion } diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/PropertyResourceConfigurer.cs b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyResourceConfigurer.cs index 2d8b787e..fa1a3b43 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/PropertyResourceConfigurer.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyResourceConfigurer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections.Specialized; using System.Globalization; using Microsoft.Extensions.Logging; @@ -74,8 +70,6 @@ public abstract class PropertyResourceConfigurer /// public static readonly string DefaultConfigSectionName = "spring-config"; - #region Fields - private readonly ILogger _log; private int _order = Int32.MaxValue; // default: same as non-Ordered @@ -85,10 +79,6 @@ public abstract class PropertyResourceConfigurer private bool _ignoreResourceNotFound = false; private bool _lastLocationOverrides = true; - #endregion - - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// @@ -105,10 +95,6 @@ public abstract class PropertyResourceConfigurer _log = LogManager.GetLogger(this.GetType()); } - #endregion - - #region Properties - /// /// The policy for resolving conflicting property overrides from /// several resources. @@ -218,8 +204,6 @@ public abstract class PropertyResourceConfigurer set { _ignoreResourceNotFound = value; } } - #endregion - /// /// Modify the application context's internal object factory after its /// standard initialization. @@ -269,8 +253,6 @@ public abstract class PropertyResourceConfigurer int sectionNameIndex = 0; foreach (IResource resource in _locations) { - #region Instrumentation - if (_log.IsEnabled(LogLevel.Debug)) { _log.LogDebug(string.Format( @@ -278,8 +260,6 @@ public abstract class PropertyResourceConfigurer "Loading configuration from '{0}'.", resource)); } - #endregion - string sectionName = configSections[sectionNameIndex]; if (resource is ConfigSectionResource) { @@ -298,14 +278,10 @@ public abstract class PropertyResourceConfigurer string errorMessage = "Could not load configuration from " + resource; if (_ignoreResourceNotFound) { - #region Instrumentation - if (_log.IsEnabled(LogLevel.Warning)) { _log.LogWarning(errorMessage); } - - #endregion } else { diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/PropertyRetrievingFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyRetrievingFactoryObject.cs index 63005886..d0341afa 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/PropertyRetrievingFactoryObject.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyRetrievingFactoryObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using System.Text; using Spring.Core; @@ -39,8 +35,6 @@ namespace Spring.Objects.Factory.Config; [Serializable] public class PropertyRetrievingFactoryObject : AbstractFactoryObject, IInitializingObject { - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// class. @@ -50,10 +44,6 @@ public class PropertyRetrievingFactoryObject : AbstractFactoryObject, IInitializ Arguments = new object[] { }; } - #endregion - - #region Properties - /// /// The of the static property /// to be retrieved. @@ -72,8 +62,6 @@ public class PropertyRetrievingFactoryObject : AbstractFactoryObject, IInitializ { indexWherePropertyStarts = typeName.LastIndexOf('.'); - #region Sanity Check - if (indexWherePropertyStarts == -1 || indexWherePropertyStarts == typeName.Length) { @@ -83,8 +71,6 @@ public class PropertyRetrievingFactoryObject : AbstractFactoryObject, IInitializ "e.g. 'Example.MyExampleClass.MyProperty, MyAssembly'"); } - #endregion - typeName = typeName.Substring(0, indexWherePropertyStarts); StringBuilder buffer = new StringBuilder(typeName); if (info.IsAssemblyQualified) @@ -178,10 +164,6 @@ public class PropertyRetrievingFactoryObject : AbstractFactoryObject, IInitializ set { _property = value; } } - #endregion - - #region Methods - /// /// Invoked by an /// after it has set all object properties supplied @@ -288,16 +270,10 @@ public class PropertyRetrievingFactoryObject : AbstractFactoryObject, IInitializ return instance; } - #endregion - - #region Fields - private string _targetProperty; private ObjectWrapper _targetObjectWrapper; private object _targetObject; private Type _targetType; private PropertyInfo _property; private object[] _arguments; - - #endregion } diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/RegistryVariableSource.cs b/src/Spring/Spring.Core/Objects/Factory/Config/RegistryVariableSource.cs index c8230124..53ca7c21 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/RegistryVariableSource.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/RegistryVariableSource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections.Specialized; using Microsoft.Win32; diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ResourceHandlerConfigurer.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ResourceHandlerConfigurer.cs index 997d38e5..47ab83a2 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/ResourceHandlerConfigurer.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/ResourceHandlerConfigurer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Spring.Core.IO; diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ResourceManagerFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ResourceManagerFactoryObject.cs index 26b6ec11..db3ce571 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/ResourceManagerFactoryObject.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/ResourceManagerFactoryObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using System.Resources; using Spring.Util; diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/RuntimeObjectReference.cs b/src/Spring/Spring.Core/Objects/Factory/Config/RuntimeObjectReference.cs index 731ae4aa..97063fa5 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/RuntimeObjectReference.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/RuntimeObjectReference.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; namespace Spring.Objects.Factory.Config; @@ -32,8 +28,6 @@ namespace Spring.Objects.Factory.Config; [Serializable] public class RuntimeObjectReference { - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// @@ -73,10 +67,6 @@ public class RuntimeObjectReference _isToParent = isToParent; } - #endregion - - #region Properties - /// /// Return the target object name. /// @@ -98,10 +88,6 @@ public class RuntimeObjectReference get { return _isToParent; } } - #endregion - - #region Methods - /// /// Returns a string representation of this instance. /// @@ -112,18 +98,10 @@ public class RuntimeObjectReference CultureInfo.InvariantCulture, "<{0}>", ObjectName); } - #endregion - - #region Fields - private string _objectName; private bool _isToParent; - #endregion - - #region Equality Members - /// /// Determines whether the specified RuntimeObjectReference is equal to the current RuntimeObjectReference. /// @@ -156,6 +134,4 @@ public class RuntimeObjectReference return (_objectName.GetHashCode() * 397) ^ _isToParent.GetHashCode(); } } - - #endregion } diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/SetFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/SetFactoryObject.cs index c6111643..1d0f0776 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/SetFactoryObject.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/SetFactoryObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using Spring.Collections; using Spring.Util; diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/SharedStateAwareProcessor.cs b/src/Spring/Spring.Core/Objects/Factory/Config/SharedStateAwareProcessor.cs index 4bc80750..5895f43d 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/SharedStateAwareProcessor.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/SharedStateAwareProcessor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Spring.Core; using Spring.Util; diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/SmartInstantiationAwareObjectPostProcessor.cs b/src/Spring/Spring.Core/Objects/Factory/Config/SmartInstantiationAwareObjectPostProcessor.cs index c43e7826..92b6f342 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/SmartInstantiationAwareObjectPostProcessor.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/SmartInstantiationAwareObjectPostProcessor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; namespace Spring.Objects.Factory.Config; diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/SpecialFolderVariableSource.cs b/src/Spring/Spring.Core/Objects/Factory/Config/SpecialFolderVariableSource.cs index db50eac5..369664f9 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/SpecialFolderVariableSource.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/SpecialFolderVariableSource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory.Config; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/TypeAliasConfigurer.cs b/src/Spring/Spring.Core/Objects/Factory/Config/TypeAliasConfigurer.cs index 12a482b7..bd6299fe 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/TypeAliasConfigurer.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/TypeAliasConfigurer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Spring.Core.TypeResolution; diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/TypedStringValue.cs b/src/Spring/Spring.Core/Objects/Factory/Config/TypedStringValue.cs index b48b608c..5e0cee25 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/TypedStringValue.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/TypedStringValue.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using Spring.Util; using Spring.Core.TypeResolution; diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/VariableAccessor.cs b/src/Spring/Spring.Core/Objects/Factory/Config/VariableAccessor.cs index 61140bde..fb6492af 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/VariableAccessor.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/VariableAccessor.cs @@ -1,5 +1,3 @@ -#region Licence - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using Spring.Util; diff --git a/src/Spring/Spring.Core/Objects/Factory/FactoryObjectNotInitializedException.cs b/src/Spring/Spring.Core/Objects/Factory/FactoryObjectNotInitializedException.cs index 49f36959..727229d9 100644 --- a/src/Spring/Spring.Core/Objects/Factory/FactoryObjectNotInitializedException.cs +++ b/src/Spring/Spring.Core/Objects/Factory/FactoryObjectNotInitializedException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using Spring.Util; diff --git a/src/Spring/Spring.Core/Objects/Factory/IFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/IFactoryObject.cs index 497907ad..e03605a5 100644 --- a/src/Spring/Spring.Core/Objects/Factory/IFactoryObject.cs +++ b/src/Spring/Spring.Core/Objects/Factory/IFactoryObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/IGenericObjectFactory.cs b/src/Spring/Spring.Core/Objects/Factory/IGenericObjectFactory.cs index bc76fb6b..10ece979 100644 --- a/src/Spring/Spring.Core/Objects/Factory/IGenericObjectFactory.cs +++ b/src/Spring/Spring.Core/Objects/Factory/IGenericObjectFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/IHierarchicalObjectFactory.cs b/src/Spring/Spring.Core/Objects/Factory/IHierarchicalObjectFactory.cs index 31add941..f1bbccaa 100644 --- a/src/Spring/Spring.Core/Objects/Factory/IHierarchicalObjectFactory.cs +++ b/src/Spring/Spring.Core/Objects/Factory/IHierarchicalObjectFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/IInitializingObject.cs b/src/Spring/Spring.Core/Objects/Factory/IInitializingObject.cs index d6f5094d..27b4c528 100644 --- a/src/Spring/Spring.Core/Objects/Factory/IInitializingObject.cs +++ b/src/Spring/Spring.Core/Objects/Factory/IInitializingObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/IListableObjectFactory.cs b/src/Spring/Spring.Core/Objects/Factory/IListableObjectFactory.cs index eb80c58c..bb0f3be2 100644 --- a/src/Spring/Spring.Core/Objects/Factory/IListableObjectFactory.cs +++ b/src/Spring/Spring.Core/Objects/Factory/IListableObjectFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/IObjectDefinitionFactory.cs b/src/Spring/Spring.Core/Objects/Factory/IObjectDefinitionFactory.cs index dc364881..c855228b 100644 --- a/src/Spring/Spring.Core/Objects/Factory/IObjectDefinitionFactory.cs +++ b/src/Spring/Spring.Core/Objects/Factory/IObjectDefinitionFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Objects.Factory.Support; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/IObjectFactory.cs b/src/Spring/Spring.Core/Objects/Factory/IObjectFactory.cs index 46c5163a..032a6aa5 100644 --- a/src/Spring/Spring.Core/Objects/Factory/IObjectFactory.cs +++ b/src/Spring/Spring.Core/Objects/Factory/IObjectFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Objects.Factory; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/IObjectFactoryAware.cs b/src/Spring/Spring.Core/Objects/Factory/IObjectFactoryAware.cs index 43c0b610..408cd10a 100644 --- a/src/Spring/Spring.Core/Objects/Factory/IObjectFactoryAware.cs +++ b/src/Spring/Spring.Core/Objects/Factory/IObjectFactoryAware.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Objects.Factory; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/IObjectNameAware.cs b/src/Spring/Spring.Core/Objects/Factory/IObjectNameAware.cs index e9c9e7ad..16f7f40c 100644 --- a/src/Spring/Spring.Core/Objects/Factory/IObjectNameAware.cs +++ b/src/Spring/Spring.Core/Objects/Factory/IObjectNameAware.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/NoSuchObjectDefinitionException.cs b/src/Spring/Spring.Core/Objects/Factory/NoSuchObjectDefinitionException.cs index ededb9d7..de955c38 100644 --- a/src/Spring/Spring.Core/Objects/Factory/NoSuchObjectDefinitionException.cs +++ b/src/Spring/Spring.Core/Objects/Factory/NoSuchObjectDefinitionException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using System.Runtime.Serialization; using System.Security.Permissions; @@ -34,8 +30,6 @@ namespace Spring.Objects.Factory; [Serializable] public class NoSuchObjectDefinitionException : ObjectsException { - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// class. @@ -147,10 +141,6 @@ public class NoSuchObjectDefinitionException : ObjectsException _objectType = typeName != null ? Type.GetType(typeName) : null; } - #endregion - - #region Methods - /// /// Populates a with /// the data needed to serialize the target object. @@ -172,10 +162,6 @@ public class NoSuchObjectDefinitionException : ObjectsException info.AddValue("ObjectTypeName", ObjectType?.AssemblyQualifiedNameWithoutVersion()); } - #endregion - - #region Properties - /// /// Return the required of object, if it was a /// lookup by that failed. @@ -194,12 +180,6 @@ public class NoSuchObjectDefinitionException : ObjectsException get { return _objectName; } } - #endregion - - #region Fields - private Type _objectType; private string _objectName; - - #endregion } diff --git a/src/Spring/Spring.Core/Objects/Factory/ObjectCreationException.cs b/src/Spring/Spring.Core/Objects/Factory/ObjectCreationException.cs index ec7347b0..414fd309 100644 --- a/src/Spring/Spring.Core/Objects/Factory/ObjectCreationException.cs +++ b/src/Spring/Spring.Core/Objects/Factory/ObjectCreationException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using System.Runtime.Serialization; using System.Security.Permissions; diff --git a/src/Spring/Spring.Core/Objects/Factory/ObjectCurrentlyInCreationException.cs b/src/Spring/Spring.Core/Objects/Factory/ObjectCurrentlyInCreationException.cs index 60fe21a9..b99cd6bd 100644 --- a/src/Spring/Spring.Core/Objects/Factory/ObjectCurrentlyInCreationException.cs +++ b/src/Spring/Spring.Core/Objects/Factory/ObjectCurrentlyInCreationException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using Spring.Util; diff --git a/src/Spring/Spring.Core/Objects/Factory/ObjectDefinitionException.cs b/src/Spring/Spring.Core/Objects/Factory/ObjectDefinitionException.cs index 82dee673..822dc403 100644 --- a/src/Spring/Spring.Core/Objects/Factory/ObjectDefinitionException.cs +++ b/src/Spring/Spring.Core/Objects/Factory/ObjectDefinitionException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using System.Security.Permissions; using Spring.Objects.Factory.Xml; @@ -33,14 +29,8 @@ namespace Spring.Objects.Factory; [Serializable] public class ObjectDefinitionException : Exception { - #region Fields - private string _className; - #endregion - - #region Constructor (s) / Destructor - /// /// Creates a new instance of the ObjectDefinitionException class. /// @@ -92,10 +82,6 @@ public class ObjectDefinitionException : Exception _className = info.GetString("MyClassName"); } - #endregion - - #region Properties - /// /// The message about the exception. /// @@ -107,10 +93,6 @@ public class ObjectDefinitionException : Exception } } - #endregion - - #region Methods - /// /// Populates a with /// the data needed to serialize the target object. @@ -130,6 +112,4 @@ public class ObjectDefinitionException : Exception base.GetObjectData(info, context); info.AddValue("MyClassName", _className); } - - #endregion } diff --git a/src/Spring/Spring.Core/Objects/Factory/ObjectDefinitionStoreException.cs b/src/Spring/Spring.Core/Objects/Factory/ObjectDefinitionStoreException.cs index e8156bc4..92fafc94 100644 --- a/src/Spring/Spring.Core/Objects/Factory/ObjectDefinitionStoreException.cs +++ b/src/Spring/Spring.Core/Objects/Factory/ObjectDefinitionStoreException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2005 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using System.Security.Permissions; using Spring.Core.IO; diff --git a/src/Spring/Spring.Core/Objects/Factory/ObjectFactoryUtils.cs b/src/Spring/Spring.Core/Objects/Factory/ObjectFactoryUtils.cs index 8386d55f..b16eb2b7 100644 --- a/src/Spring/Spring.Core/Objects/Factory/ObjectFactoryUtils.cs +++ b/src/Spring/Spring.Core/Objects/Factory/ObjectFactoryUtils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.CompilerServices; using Spring.Util; @@ -38,8 +34,6 @@ namespace Spring.Objects.Factory; /// Rick Evans (.NET) public sealed class ObjectFactoryUtils { - // CLOVER:OFF - /// /// Creates a new instance of the /// class. @@ -54,8 +48,6 @@ public sealed class ObjectFactoryUtils { } - // CLOVER:ON - /// /// Used to dereference an /// and distinguish it from managed objects created by the factory. diff --git a/src/Spring/Spring.Core/Objects/Factory/ObjectInitializationException.cs b/src/Spring/Spring.Core/Objects/Factory/ObjectInitializationException.cs index b88eb7be..303cfda2 100644 --- a/src/Spring/Spring.Core/Objects/Factory/ObjectInitializationException.cs +++ b/src/Spring/Spring.Core/Objects/Factory/ObjectInitializationException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Objects.Factory; @@ -39,8 +35,6 @@ namespace Spring.Objects.Factory; [Serializable] public class ObjectInitializationException : FatalObjectException { - #region Constructor (s) / Destructor - /// /// Creates a new instance of the ObjectInitializationException class. /// @@ -89,6 +83,4 @@ public class ObjectInitializationException : FatalObjectException : base(info, context) { } - - #endregion } diff --git a/src/Spring/Spring.Core/Objects/Factory/ObjectIsNotAFactoryException.cs b/src/Spring/Spring.Core/Objects/Factory/ObjectIsNotAFactoryException.cs index d7e53681..1a98cf86 100644 --- a/src/Spring/Spring.Core/Objects/Factory/ObjectIsNotAFactoryException.cs +++ b/src/Spring/Spring.Core/Objects/Factory/ObjectIsNotAFactoryException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Objects.Factory; diff --git a/src/Spring/Spring.Core/Objects/Factory/ObjectNotOfRequiredTypeException.cs b/src/Spring/Spring.Core/Objects/Factory/ObjectNotOfRequiredTypeException.cs index 57735068..28981a33 100644 --- a/src/Spring/Spring.Core/Objects/Factory/ObjectNotOfRequiredTypeException.cs +++ b/src/Spring/Spring.Core/Objects/Factory/ObjectNotOfRequiredTypeException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using System.Security.Permissions; @@ -31,8 +27,6 @@ namespace Spring.Objects.Factory; [Serializable] public class ObjectNotOfRequiredTypeException : ObjectsException { - #region Constructor (s) / Destructor - /// /// Creates a new instance of the ObjectNotOfRequiredTypeException class. /// @@ -113,10 +107,6 @@ public class ObjectNotOfRequiredTypeException : ObjectsException name = info.GetString("Name"); } - #endregion - - #region Properties - /// /// The actual of the actual object /// instance that was retrieved. @@ -164,10 +154,6 @@ public class ObjectNotOfRequiredTypeException : ObjectsException } } - #endregion - - #region Methods - /// /// Populates a with /// the data needed to serialize the target object. @@ -190,13 +176,7 @@ public class ObjectNotOfRequiredTypeException : ObjectsException info.AddValue("Name", name); } - #endregion - - #region Fields - private Type requiredType; private object actualInstance; private string name; - - #endregion } diff --git a/src/Spring/Spring.Core/Objects/Factory/Parsing/FailFastProblemReporter.cs b/src/Spring/Spring.Core/Objects/Factory/Parsing/FailFastProblemReporter.cs index 16073c39..b5d2a364 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Parsing/FailFastProblemReporter.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Parsing/FailFastProblemReporter.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; namespace Spring.Objects.Factory.Parsing; diff --git a/src/Spring/Spring.Core/Objects/Factory/Parsing/IProblemReporter.cs b/src/Spring/Spring.Core/Objects/Factory/Parsing/IProblemReporter.cs index 4768db37..7c8f6607 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Parsing/IProblemReporter.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Parsing/IProblemReporter.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory.Parsing; public interface IProblemReporter diff --git a/src/Spring/Spring.Core/Objects/Factory/Parsing/Location.cs b/src/Spring/Spring.Core/Objects/Factory/Parsing/Location.cs index c2f53b20..ed6aa732 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Parsing/Location.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Parsing/Location.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Core.IO; namespace Spring.Objects.Factory.Parsing; diff --git a/src/Spring/Spring.Core/Objects/Factory/Parsing/ObjectDefinitionParsingException.cs b/src/Spring/Spring.Core/Objects/Factory/Parsing/ObjectDefinitionParsingException.cs index 39462f9b..59b358bb 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Parsing/ObjectDefinitionParsingException.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Parsing/ObjectDefinitionParsingException.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using Spring.Core.IO; diff --git a/src/Spring/Spring.Core/Objects/Factory/Parsing/Problem.cs b/src/Spring/Spring.Core/Objects/Factory/Parsing/Problem.cs index 83c8a4ee..76624d01 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Parsing/Problem.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Parsing/Problem.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Text; using Spring.Util; diff --git a/src/Spring/Spring.Core/Objects/Factory/Parsing/ReaderContext.cs b/src/Spring/Spring.Core/Objects/Factory/Parsing/ReaderContext.cs index ff9dba2c..a552f349 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Parsing/ReaderContext.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Parsing/ReaderContext.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Core.IO; namespace Spring.Objects.Factory.Parsing; diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/AbstractMethodReplacer.cs b/src/Spring/Spring.Core/Objects/Factory/Support/AbstractMethodReplacer.cs index 3e3fd730..aae79cba 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/AbstractMethodReplacer.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/AbstractMethodReplacer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using Spring.Util; diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectDefinitionReader.cs b/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectDefinitionReader.cs index 4ff243e2..ce29f179 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectDefinitionReader.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectDefinitionReader.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using Spring.Core.IO; using Spring.Util; @@ -36,17 +32,11 @@ namespace Spring.Objects.Factory.Support; /// Rick Evans (.NET) public abstract class AbstractObjectDefinitionReader : IObjectDefinitionReader { - #region Constants - /// /// The instance for this class (and derived classes). /// protected readonly ILogger log; - #endregion - - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// @@ -103,10 +93,6 @@ public abstract class AbstractObjectDefinitionReader : IObjectDefinitionReader } } - #endregion - - #region Properties - /// /// Gets the /// @@ -157,10 +143,6 @@ public abstract class AbstractObjectDefinitionReader : IObjectDefinitionReader set { _resourceLoader = value; } } - #endregion - - #region Methods - /// /// Load object definitions from the supplied . /// @@ -256,14 +238,8 @@ public abstract class AbstractObjectDefinitionReader : IObjectDefinitionReader return counter; } - #endregion - - #region Fields - private IObjectDefinitionRegistry _registry; private AppDomain _domain; private IResourceLoader _resourceLoader; private IObjectNameGenerator _objectNameGenerator = new DefaultObjectNameGenerator(); - - #endregion } \ No newline at end of file diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/AutowireUtils.cs b/src/Spring/Spring.Core/Objects/Factory/Support/AutowireUtils.cs index 99f5f8f9..0f9213ce 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/AutowireUtils.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/AutowireUtils.cs @@ -32,8 +32,6 @@ namespace Spring.Objects.Factory.Support; /// Rick Evans (.NET) public sealed class AutowireUtils { - // CLOVER:OFF - /// /// Creates a new instance of the AutowireUtils class. /// @@ -47,8 +45,6 @@ public sealed class AutowireUtils { } - // CLOVER:ON - /// /// Gets those s /// that are applicable for autowiring the supplied . diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/DefaultObjectNameGenerator.cs b/src/Spring/Spring.Core/Objects/Factory/Support/DefaultObjectNameGenerator.cs index 60e20213..76be30b1 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/DefaultObjectNameGenerator.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/DefaultObjectNameGenerator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects.Factory.Config; namespace Spring.Objects.Factory.Support; @@ -34,8 +30,6 @@ namespace Spring.Objects.Factory.Support; /// Mark Pollack (.NET) public class DefaultObjectNameGenerator : IObjectNameGenerator { - #region IObjectNameGenerator Members - /// /// Generates an object name for the given object definition. /// @@ -55,6 +49,4 @@ public class DefaultObjectNameGenerator : IObjectNameGenerator return ObjectDefinitionReaderUtils.GenerateObjectName(objectDef, registry); } - - #endregion } diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/DelegateInvokingFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Support/DelegateInvokingFactoryObject.cs index c3ff0320..76928eda 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/DelegateInvokingFactoryObject.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/DelegateInvokingFactoryObject.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory.Support; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/DelegatingMethodReplacer.cs b/src/Spring/Spring.Core/Objects/Factory/Support/DelegatingMethodReplacer.cs index 190cd076..49b52d8d 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/DelegatingMethodReplacer.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/DelegatingMethodReplacer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; namespace Spring.Objects.Factory.Support; diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/DependencyCheckingMode.cs b/src/Spring/Spring.Core/Objects/Factory/Support/DependencyCheckingMode.cs index 0759e04c..6741744a 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/DependencyCheckingMode.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/DependencyCheckingMode.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory.Support; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/GenericObjectDefinition.cs b/src/Spring/Spring.Core/Objects/Factory/Support/GenericObjectDefinition.cs index e094d320..d3cedf16 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/GenericObjectDefinition.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/GenericObjectDefinition.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects.Factory.Config; namespace Spring.Objects.Factory.Support; diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/IAutowireCandidateResolver.cs b/src/Spring/Spring.Core/Objects/Factory/Support/IAutowireCandidateResolver.cs index b350f8f8..d9a53973 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/IAutowireCandidateResolver.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/IAutowireCandidateResolver.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects.Factory.Config; namespace Spring.Objects.Factory.Support; diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/IConfigurableObjectDefinition.cs b/src/Spring/Spring.Core/Objects/Factory/Support/IConfigurableObjectDefinition.cs index 159af3b3..eef715f0 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/IConfigurableObjectDefinition.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/IConfigurableObjectDefinition.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects.Factory.Config; namespace Spring.Objects.Factory.Support; diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/IInstantiationStrategy.cs b/src/Spring/Spring.Core/Objects/Factory/Support/IInstantiationStrategy.cs index e740c9a2..97453578 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/IInstantiationStrategy.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/IInstantiationStrategy.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; namespace Spring.Objects.Factory.Support; diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/IMethodReplacer.cs b/src/Spring/Spring.Core/Objects/Factory/Support/IMethodReplacer.cs index 9b1021be..292e40bc 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/IMethodReplacer.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/IMethodReplacer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; namespace Spring.Objects.Factory.Support; diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/IObjectDefinitionReader.cs b/src/Spring/Spring.Core/Objects/Factory/Support/IObjectDefinitionReader.cs index 6a01c521..e5b14e67 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/IObjectDefinitionReader.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/IObjectDefinitionReader.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Core.IO; namespace Spring.Objects.Factory.Support; diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/IObjectDefinitionRegistry.cs b/src/Spring/Spring.Core/Objects/Factory/Support/IObjectDefinitionRegistry.cs index fed266a7..8e0cd073 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/IObjectDefinitionRegistry.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/IObjectDefinitionRegistry.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects.Factory.Config; namespace Spring.Objects.Factory.Support; diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/IObjectDefinitionRegistryPostProcessor.cs b/src/Spring/Spring.Core/Objects/Factory/Support/IObjectDefinitionRegistryPostProcessor.cs index 443a8b14..27d61ac8 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/IObjectDefinitionRegistryPostProcessor.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/IObjectDefinitionRegistryPostProcessor.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects.Factory.Config; namespace Spring.Objects.Factory.Support; diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/IObjectNameGenerator.cs b/src/Spring/Spring.Core/Objects/Factory/Support/IObjectNameGenerator.cs index ee4ffd56..97086385 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/IObjectNameGenerator.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/IObjectNameGenerator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects.Factory.Config; namespace Spring.Objects.Factory.Support; diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/Interface1.cs b/src/Spring/Spring.Core/Objects/Factory/Support/Interface1.cs index 099da016..fbad4fcb 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/Interface1.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/Interface1.cs @@ -1,5 +1,3 @@ -#region License - // /* // * Copyright 2018 the original author or authors. // * @@ -16,8 +14,6 @@ // * limitations under the License. // */ -#endregion - using Spring.Objects.Factory.Config; namespace Spring.Objects.Factory.Support; diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/LookupMethodOverride.cs b/src/Spring/Spring.Core/Objects/Factory/Support/LookupMethodOverride.cs index 96f2b7b8..852a8349 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/LookupMethodOverride.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/LookupMethodOverride.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using System.Text; using Spring.Util; diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/LookupMethodReplacer.cs b/src/Spring/Spring.Core/Objects/Factory/Support/LookupMethodReplacer.cs index 9cce46d1..fd20876d 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/LookupMethodReplacer.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/LookupMethodReplacer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; namespace Spring.Objects.Factory.Support; diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/MethodInjectingInstantiationStrategy.cs b/src/Spring/Spring.Core/Objects/Factory/Support/MethodInjectingInstantiationStrategy.cs index c7b0c05b..8a40a6f8 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/MethodInjectingInstantiationStrategy.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/MethodInjectingInstantiationStrategy.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Globalization; using System.Reflection; @@ -185,8 +181,6 @@ public class MethodInjectingInstantiationStrategy : SimpleInstantiationStrategy Type generatedType = (Type) typeCache[objectName]; if (generatedType == null) { - #region Instrumentation - if (log.IsEnabled(LogLevel.Debug)) { log.LogDebug(string.Format(CultureInfo.InvariantCulture, @@ -195,8 +189,6 @@ public class MethodInjectingInstantiationStrategy : SimpleInstantiationStrategy definition.ObjectType, objectName)); } - #endregion - ModuleBuilder module = DynamicCodeManager.GetModuleBuilder(DYNAMIC_ASSEMBLY_NAME); generatedType = new MethodInjectingTypeBuilder(module, definition).BuildType(); typeCache[objectName] = generatedType; @@ -206,8 +198,6 @@ public class MethodInjectingInstantiationStrategy : SimpleInstantiationStrategy } } - #region Inner Class : MethodInjectingTypeBuilder - /// /// A factory that generates subclasses of those /// classes that have been configured for the Method-Injection form of @@ -616,6 +606,4 @@ public class MethodInjectingInstantiationStrategy : SimpleInstantiationStrategy return attributes; } } - - #endregion } \ No newline at end of file diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/MethodOverride.cs b/src/Spring/Spring.Core/Objects/Factory/Support/MethodOverride.cs index 9373c119..0fe785f6 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/MethodOverride.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/MethodOverride.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using Spring.Util; diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/ObjectDefinitionReaderUtils.cs b/src/Spring/Spring.Core/Objects/Factory/Support/ObjectDefinitionReaderUtils.cs index 981d7b8f..0611aec1 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/ObjectDefinitionReaderUtils.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/ObjectDefinitionReaderUtils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Text.RegularExpressions; using Spring.Objects.Factory.Config; using Spring.Objects.Factory.Xml; @@ -263,10 +259,6 @@ public sealed class ObjectDefinitionReaderUtils return generatedName; } - #region Constructor (s) / Destructor - - // CLOVER:OFF - /// /// Creates a new instance of the /// class. @@ -281,6 +273,4 @@ public sealed class ObjectDefinitionReaderUtils } // CLOVER:ON - - #endregion } diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/ObjectDefinitionValidationException.cs b/src/Spring/Spring.Core/Objects/Factory/Support/ObjectDefinitionValidationException.cs index 446a0f53..af2a5afc 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/ObjectDefinitionValidationException.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/ObjectDefinitionValidationException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Objects.Factory.Support; @@ -30,8 +26,6 @@ namespace Spring.Objects.Factory.Support; [Serializable] public class ObjectDefinitionValidationException : FatalObjectException { - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// @@ -84,6 +78,4 @@ public class ObjectDefinitionValidationException : FatalObjectException : base(info, context) { } - - #endregion } diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/ObjectScope.cs b/src/Spring/Spring.Core/Objects/Factory/Support/ObjectScope.cs index 56cbf219..4a8a2e8e 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/ObjectScope.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/ObjectScope.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory.Support; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/PropertiesObjectDefinitionReader.cs b/src/Spring/Spring.Core/Objects/Factory/Support/PropertiesObjectDefinitionReader.cs index c1004a69..6a19543c 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/PropertiesObjectDefinitionReader.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/PropertiesObjectDefinitionReader.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Collections.Specialized; using System.Resources; @@ -357,15 +353,11 @@ public class PropertiesObjectDefinitionReader : AbstractObjectDefinitionReader { string name = nameAndProperty.Substring(0, sepIndx); - #region Instrumentation - if (log.IsEnabled(LogLevel.Debug)) { log.LogDebug("Found object name '" + name + "'"); } - #endregion - if (!Registry.ContainsObjectDefinition(name)) { ++objectCount; @@ -378,14 +370,10 @@ public class PropertiesObjectDefinitionReader : AbstractObjectDefinitionReader // Ignore it: it wasn't a valid object name and property, // although it did start with the required prefix - #region Instrumentation - if (log.IsEnabled(LogLevel.Debug)) { log.LogDebug("Invalid object name and property [" + nameAndProperty + "]"); } - - #endregion } } // if the key started with the prefix we're looking for } // while there are more keys diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/RootObjectDefinition.cs b/src/Spring/Spring.Core/Objects/Factory/Support/RootObjectDefinition.cs index 59a07ef7..ab981be5 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/RootObjectDefinition.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/RootObjectDefinition.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using System.Runtime.Serialization; using Spring.Objects.Factory.Config; diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/SimpleAutowireCandidateResolver.cs b/src/Spring/Spring.Core/Objects/Factory/Support/SimpleAutowireCandidateResolver.cs index 78942b59..3b95e7be 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/SimpleAutowireCandidateResolver.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/SimpleAutowireCandidateResolver.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects.Factory.Config; namespace Spring.Objects.Factory.Support; diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/SimpleInstantiationStrategy.cs b/src/Spring/Spring.Core/Objects/Factory/Support/SimpleInstantiationStrategy.cs index 088b9cc4..56b299b9 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/SimpleInstantiationStrategy.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/SimpleInstantiationStrategy.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using System.Reflection; using Microsoft.Extensions.Logging; @@ -198,15 +194,11 @@ public class SimpleInstantiationStrategy : IInstantiationStrategy CultureInfo.InvariantCulture, "Factory method '{0}' threw an Exception.", factoryMethod); - #region Instrumentation - if (log.IsEnabled(LogLevel.Warning)) { log.LogWarning(ex.InnerException, msg); } - #endregion - throw new ObjectDefinitionStoreException(msg, ex.InnerException); } catch (Exception ex) diff --git a/src/Spring/Spring.Core/Objects/Factory/UnsatisfiedDependencyException.cs b/src/Spring/Spring.Core/Objects/Factory/UnsatisfiedDependencyException.cs index 6af0a6fc..20a59f7d 100644 --- a/src/Spring/Spring.Core/Objects/Factory/UnsatisfiedDependencyException.cs +++ b/src/Spring/Spring.Core/Objects/Factory/UnsatisfiedDependencyException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Objects.Factory; diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/AbstractObjectDefinitionParser.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/AbstractObjectDefinitionParser.cs index b4bdc3a2..3620868e 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Xml/AbstractObjectDefinitionParser.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Xml/AbstractObjectDefinitionParser.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Xml; using Spring.Objects.Factory.Config; using Spring.Objects.Factory.Support; @@ -51,8 +47,6 @@ public abstract class AbstractObjectDefinitionParser : IObjectDefinitionParser /// public static readonly string ID_ATTRIBUTE = "id"; - #region Properties - /// /// Gets a value indicating whether an ID should be generated instead of read /// from the passed in XmlElement. @@ -81,10 +75,6 @@ public abstract class AbstractObjectDefinitionParser : IObjectDefinitionParser get { return false; } } - #endregion - - #region IObjectDefinitionParser Members - /// /// Parse the specified XmlElement and register the resulting /// ObjectDefinitions with the IObjectDefinitionRegistry @@ -129,10 +119,6 @@ public abstract class AbstractObjectDefinitionParser : IObjectDefinitionParser return definition; } - #endregion - - #region Methods - /// /// Resolves the ID for the supplied . /// @@ -224,10 +210,6 @@ public abstract class AbstractObjectDefinitionParser : IObjectDefinitionParser return defaultValue; } - #endregion - - #region Abstract Methods - /// /// Central template method to actually parse the supplied XmlElement /// into one or more IObjectDefinitions. @@ -237,6 +219,4 @@ public abstract class AbstractObjectDefinitionParser : IObjectDefinitionParser /// provides access to a /// The primary IObjectDefinition resulting from the parsing of the supplied XmlElement protected abstract AbstractObjectDefinition ParseInternal(XmlElement element, ParserContext parserContext); - - #endregion } diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/AbstractSimpleObjectDefinitionParser.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/AbstractSimpleObjectDefinitionParser.cs index 52e74ea0..6cddcae2 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Xml/AbstractSimpleObjectDefinitionParser.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Xml/AbstractSimpleObjectDefinitionParser.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory.Xml; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/AbstractSingleObjectDefinitionParser.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/AbstractSingleObjectDefinitionParser.cs index dc91163c..32928cfc 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Xml/AbstractSingleObjectDefinitionParser.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Xml/AbstractSingleObjectDefinitionParser.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Xml; using Spring.Objects.Factory.Support; @@ -42,8 +38,6 @@ namespace Spring.Objects.Factory.Xml; /// Mark Pollack (.NET) public class AbstractSingleObjectDefinitionParser : AbstractObjectDefinitionParser { - #region Methods - /// /// Central template method to actually parse the supplied XmlElement /// into one or more IObjectDefinitions. @@ -160,6 +154,4 @@ public class AbstractSingleObjectDefinitionParser : AbstractObjectDefinitionPars protected virtual void DoParse(XmlElement element, ObjectDefinitionBuilder builder) { } - - #endregion } \ No newline at end of file diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/DefaultNamespaceHandlerResolver.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/DefaultNamespaceHandlerResolver.cs index 0ebff03a..87dd839f 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Xml/DefaultNamespaceHandlerResolver.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Xml/DefaultNamespaceHandlerResolver.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory.Xml; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/DocumentDefaultsDefinition.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/DocumentDefaultsDefinition.cs index e00b9d40..705f8cea 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Xml/DocumentDefaultsDefinition.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Xml/DocumentDefaultsDefinition.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory.Xml; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/INamespaceParser.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/INamespaceParser.cs index 8e162bb3..a3a2a63c 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Xml/INamespaceParser.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Xml/INamespaceParser.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Xml; using Spring.Objects.Factory.Config; diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/INamespaceParserResolver.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/INamespaceParserResolver.cs index 0ebdfe69..c418dd40 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Xml/INamespaceParserResolver.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Xml/INamespaceParserResolver.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory.Xml; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/IObjectDefinitionDocumentReader.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/IObjectDefinitionDocumentReader.cs index bb005103..2986b8e7 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Xml/IObjectDefinitionDocumentReader.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Xml/IObjectDefinitionDocumentReader.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Xml; namespace Spring.Objects.Factory.Xml; diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/IObjectDefinitionParser.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/IObjectDefinitionParser.cs index dcc10c8e..55e687a6 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Xml/IObjectDefinitionParser.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Xml/IObjectDefinitionParser.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Xml; using Spring.Objects.Factory.Config; diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/NamespaceParserAttribute.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/NamespaceParserAttribute.cs index a2fcf2a2..e89393b1 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Xml/NamespaceParserAttribute.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Xml/NamespaceParserAttribute.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory.Xml; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/NamespaceParserSupport.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/NamespaceParserSupport.cs index 6cfaa250..6fd33895 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Xml/NamespaceParserSupport.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Xml/NamespaceParserSupport.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Xml; using Spring.Objects.Factory.Config; using Spring.Util; @@ -37,8 +33,6 @@ public abstract class NamespaceParserSupport : INamespaceParser { private readonly IDictionary objectParsers = new Dictionary(); - #region IXmlObjectDefinitionParser Members - /// /// Invoked by after construction but before any /// elements have been parsed. @@ -110,6 +104,4 @@ public abstract class NamespaceParserSupport : INamespaceParser AssertUtils.ArgumentNotNull(parser, "parser"); objectParsers[elementName] = parser; } - - #endregion } diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectDefinitionConstants.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectDefinitionConstants.cs index 8da802a7..563d71cc 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectDefinitionConstants.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectDefinitionConstants.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects.Factory.Config; using Spring.Objects.Factory.Support; @@ -796,10 +792,6 @@ public sealed class ObjectDefinitionConstants public static readonly string AutowireAutoDetectValue = Enum.GetName(typeof(AutoWiringMode), AutoWiringMode.AutoDetect); - #region Constructor (s) / Destructor - - // CLOVER:OFF - /// /// Creates a new instance of the /// @@ -816,6 +808,4 @@ public sealed class ObjectDefinitionConstants } // CLOVER:ON - - #endregion } diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectDefinitionParserHelper.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectDefinitionParserHelper.cs index e7de4044..7c2c1fec 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectDefinitionParserHelper.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectDefinitionParserHelper.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using System.Xml; using Microsoft.Extensions.Logging; @@ -38,8 +34,6 @@ namespace Spring.Objects.Factory.Xml; /// Mark Pollack (.NET) public class ObjectDefinitionParserHelper { - #region Fields - /// /// The shared instance for this class (and derived classes). /// @@ -53,8 +47,6 @@ public class ObjectDefinitionParserHelper private readonly HashSet usedNames = new HashSet(); - #endregion - /// /// Initializes a new instance of the class. /// @@ -107,19 +99,13 @@ public class ObjectDefinitionParserHelper { DocumentDefaultsDefinition ddd = new DocumentDefaultsDefinition(); - #region Instrumentation - if (log.IsEnabled(LogLevel.Debug)) { log.LogDebug("Loading object definitions..."); } - #endregion - ddd.LazyInit = GetAttributeValue(root, ObjectDefinitionConstants.DefaultLazyInitAttribute); - #region Instrumentation - if (log.IsEnabled(LogLevel.Debug)) { log.LogDebug(string.Format( @@ -127,12 +113,8 @@ public class ObjectDefinitionParserHelper ddd.LazyInit)); } - #endregion - ddd.DependencyCheck = GetAttributeValue(root, ObjectDefinitionConstants.DefaultDependencyCheckAttribute); - #region Instrumentation - if (log.IsEnabled(LogLevel.Debug)) { log.LogDebug(string.Format( @@ -140,12 +122,8 @@ public class ObjectDefinitionParserHelper ddd.DependencyCheck)); } - #endregion - ddd.Autowire = GetAttributeValue(root, ObjectDefinitionConstants.DefaultAutowireAttribute); - #region Instrumentation - if (log.IsEnabled(LogLevel.Debug)) { log.LogDebug(string.Format( @@ -153,12 +131,8 @@ public class ObjectDefinitionParserHelper ddd.Autowire)); } - #endregion - ddd.Merge = GetAttributeValue(root, ObjectDefinitionConstants.DefaultMergeAttribute); - #region Instrumentation - if (log.IsEnabled(LogLevel.Debug)) { log.LogDebug(string.Format( @@ -166,12 +140,8 @@ public class ObjectDefinitionParserHelper ddd.Merge)); } - #endregion - ddd.AutowireCandidates = GetAttributeValue(root, ObjectDefinitionConstants.DefaultAutowireCandidatesAttribute); - #region Instrumentation - if (log.IsEnabled(LogLevel.Debug)) { log.LogDebug(string.Format( @@ -179,12 +149,8 @@ public class ObjectDefinitionParserHelper ddd.InitMethod)); } - #endregion - ddd.DestroyMethod = GetAttributeValue(root, ObjectDefinitionConstants.DefaultDestroyMethodAttribute); - #region Instrumentation - if (log.IsEnabled(LogLevel.Debug)) { log.LogDebug(string.Format( @@ -192,12 +158,8 @@ public class ObjectDefinitionParserHelper ddd.DestroyMethod)); } - #endregion - ddd.AutowireCandidates = GetAttributeValue(root, ObjectDefinitionConstants.DefaultAutowireCandidatesAttribute); - #region Instrumentation - if (log.IsEnabled(LogLevel.Debug)) { log.LogDebug(string.Format( @@ -205,12 +167,8 @@ public class ObjectDefinitionParserHelper ddd.AutowireCandidates)); } - #endregion - ddd.InitMethod = GetAttributeValue(root, ObjectDefinitionConstants.DefaultInitMethodAttribute); - #region Instrumentation - if (log.IsEnabled(LogLevel.Debug)) { log.LogDebug(string.Format( @@ -218,12 +176,8 @@ public class ObjectDefinitionParserHelper ddd.InitMethod)); } - #endregion - ddd.DestroyMethod = GetAttributeValue(root, ObjectDefinitionConstants.DefaultDestroyMethodAttribute); - #region Instrumentation - if (log.IsEnabled(LogLevel.Debug)) { log.LogDebug(string.Format( @@ -231,8 +185,6 @@ public class ObjectDefinitionParserHelper ddd.DestroyMethod)); } - #endregion - defaults = ddd; } @@ -366,16 +318,12 @@ public class ObjectDefinitionParserHelper } } - #region Instrumentation - if (log.IsEnabled(LogLevel.Debug)) { log.LogDebug(string.Format( "Neither XML '{0}' nor '{1}' specified - using generated object name [{2}]", ObjectDefinitionConstants.IdAttribute, ObjectDefinitionConstants.NameAttribute, objectName)); } - - #endregion } return CreateObjectDefinitionHolder(element, definition, objectName, aliases); diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectFactorySectionHandler.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectFactorySectionHandler.cs index 5793899a..30fd23dd 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectFactorySectionHandler.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectFactorySectionHandler.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Configuration; using System.Xml; using Spring.Core.IO; diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectsNamespaceParser.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectsNamespaceParser.cs index 48d39d39..93e6c2b3 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectsNamespaceParser.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectsNamespaceParser.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2005 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Collections.Specialized; using System.Globalization; @@ -32,8 +26,6 @@ using Spring.Objects.Factory.Config; using Spring.Objects.Factory.Support; using Spring.Util; -#endregion - namespace Spring.Objects.Factory.Xml; /// @@ -72,8 +64,6 @@ public class ObjectsNamespaceParser : AbstractObjectDefinitionParser, INamespace /// protected static readonly ILogger log = LogManager.GetLogger(); - #region IXmlObjectDefinitionParser Members - /// /// Invoked by after construction but before any /// elements have been parsed. @@ -83,8 +73,6 @@ public class ObjectsNamespaceParser : AbstractObjectDefinitionParser, INamespace { } - #endregion - /// /// Parse the specified XmlElement and register the resulting /// ObjectDefinitions with the IObjectDefinitionRegistry @@ -198,8 +186,6 @@ public class ObjectsNamespaceParser : AbstractObjectDefinitionParser, INamespace string location = GetAttributeValue(resource, ObjectDefinitionConstants.ImportResourceAttribute); try { - #region Instrumentation - if (log.IsEnabled(LogLevel.Debug)) { log.LogDebug(string.Format( @@ -207,8 +193,6 @@ public class ObjectsNamespaceParser : AbstractObjectDefinitionParser, INamespace "Attempting to import object definitions from '{0}'.", location)); } - #endregion - IResource importResource = parserContext.ReaderContext.Resource.CreateRelative(location); parserContext.ReaderContext.Reader.LoadObjectDefinitions(importResource); } @@ -304,8 +288,6 @@ public class ObjectsNamespaceParser : AbstractObjectDefinitionParser, INamespace holder = parserContext.ParserHelper.DecorateObjectDefinitionIfRequired(element, holder); - #region Instrumentation - if (log.IsEnabled(LogLevel.Debug)) { log.LogDebug(string.Format( @@ -313,8 +295,6 @@ public class ObjectsNamespaceParser : AbstractObjectDefinitionParser, INamespace "Registering object definition with id '{0}'.", holder.ObjectName)); } - #endregion - return holder; } @@ -1257,8 +1237,6 @@ public class ObjectsNamespaceParser : AbstractObjectDefinitionParser, INamespace XmlNodeList entryElements = SelectNodes(mapEle, ObjectDefinitionConstants.EntryElement); foreach (XmlElement entryEle in entryElements) { - #region Key - object key = null; XmlAttribute keyAtt = entryEle.Attributes[ObjectDefinitionConstants.KeyAttribute]; @@ -1305,10 +1283,6 @@ public class ObjectsNamespaceParser : AbstractObjectDefinitionParser, INamespace } } - #endregion - - #region Value - XmlAttribute inlineValueAtt = entryEle.Attributes[ObjectDefinitionConstants.ValueAttribute]; if (inlineValueAtt != null) { @@ -1350,8 +1324,6 @@ public class ObjectsNamespaceParser : AbstractObjectDefinitionParser, INamespace dictionary[key] = ParsePropertySubElement((XmlElement) valueElements.Item(0), name, parserContext); } - - #endregion } return dictionary; @@ -1503,16 +1475,12 @@ public class ObjectsNamespaceParser : AbstractObjectDefinitionParser, INamespace } catch (ArgumentException ex) { - #region Instrumentation - if (log.IsEnabled(LogLevel.Debug)) { string message = string.Format("Error while parsing dependency checking mode : '{0}' is an invalid value.", value); log.LogDebug(ex, message); } - - #endregion } } @@ -1546,16 +1514,12 @@ public class ObjectsNamespaceParser : AbstractObjectDefinitionParser, INamespace } catch (ArgumentException ex) { - #region Instrumentation - if (log.IsEnabled(LogLevel.Debug)) { string message = string.Format("Error while parsing autowire mode : '{0}' is an invalid value.", value); log.LogDebug(ex, message); } - - #endregion } } diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/ParserContext.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/ParserContext.cs index aa065bc4..5318a96d 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Xml/ParserContext.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Xml/ParserContext.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects.Factory.Config; using Spring.Objects.Factory.Support; diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/ReplacedMethodOverride.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/ReplacedMethodOverride.cs index f6aa019f..7d61e31f 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Xml/ReplacedMethodOverride.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Xml/ReplacedMethodOverride.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections.Specialized; using System.Reflection; using System.Text; diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/XmlObjectDefinitionReader.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/XmlObjectDefinitionReader.cs index bec4e5bb..6093c44a 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Xml/XmlObjectDefinitionReader.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Xml/XmlObjectDefinitionReader.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2005 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Xml; using System.Xml.Schema; using Microsoft.Extensions.Logging; @@ -28,8 +22,6 @@ using Spring.Objects.Factory.Config; using Spring.Objects.Factory.Support; using Spring.Util; -#endregion - namespace Spring.Objects.Factory.Xml; /// @@ -53,8 +45,6 @@ namespace Spring.Objects.Factory.Xml; /// Rick Evans (.NET) public class XmlObjectDefinitionReader : AbstractObjectDefinitionReader { - #region Utility Classes - /// /// For retrying the parse process /// @@ -65,20 +55,12 @@ public class XmlObjectDefinitionReader : AbstractObjectDefinitionReader } } - #endregion - - #region Fields - [NonSerialized] private XmlResolver resolver; private Type documentReaderType; private INamespaceParserResolver namespaceParserResolver; private IObjectDefinitionFactory objectDefinitionFactory; - #endregion - - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// class. @@ -128,10 +110,6 @@ public class XmlObjectDefinitionReader : AbstractObjectDefinitionReader this.objectDefinitionFactory = objectDefinitionFactory; } - #endregion - - #region Properties - /// /// The to be used for parsing. /// @@ -197,10 +175,6 @@ public class XmlObjectDefinitionReader : AbstractObjectDefinitionReader } } - #endregion - - #region Methods - /// /// Load object definitions from the supplied XML . /// @@ -221,15 +195,11 @@ public class XmlObjectDefinitionReader : AbstractObjectDefinitionReader ("Resource cannot be null: expected an XML resource."); } - #region Instrumentation - if (log.IsEnabled(LogLevel.Debug)) { log.LogDebug("Loading XML object definitions from " + resource); } - #endregion - try { Stream stream = resource.InputStream; @@ -245,25 +215,17 @@ public class XmlObjectDefinitionReader : AbstractObjectDefinitionReader } finally { - #region Close stream - try { stream.Close(); } catch (IOException ex) { - #region Instrumentation - if (log.IsEnabled(LogLevel.Warning)) { log.LogWarning(ex, "Could not close stream."); } - - #endregion } - - #endregion } } catch (IOException ex) @@ -342,16 +304,12 @@ public class XmlObjectDefinitionReader : AbstractObjectDefinitionReader reader = XmlUtils.CreateValidatingReader(stream, Resolver, NamespaceParserRegistry.GetSchemas(), HandleValidation); } - #region Instrumentation - if (log.IsEnabled(LogLevel.Debug)) { log.LogDebug("Using the following XmlReader implementation : " + reader.GetType()); } return reader; - - #endregion } /// @@ -379,15 +337,11 @@ public class XmlObjectDefinitionReader : AbstractObjectDefinitionReader } else { - #region Instrumentation - if (log.IsEnabled(LogLevel.Warning)) { string message = "Ignored XML validation warning: " + args.Message; log.LogWarning(args.Exception, message); } - - #endregion } } @@ -456,6 +410,4 @@ public class XmlObjectDefinitionReader : AbstractObjectDefinitionReader { return new DefaultNamespaceHandlerResolver(); } - - #endregion } diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/XmlReaderContext.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/XmlReaderContext.cs index 2d508e56..5eee0761 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Xml/XmlReaderContext.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Xml/XmlReaderContext.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Xml; using Spring.Core.IO; using Spring.Objects.Factory.Config; diff --git a/src/Spring/Spring.Core/Objects/FatalObjectException.cs b/src/Spring/Spring.Core/Objects/FatalObjectException.cs index 118f0107..4ef7d9b5 100644 --- a/src/Spring/Spring.Core/Objects/FatalObjectException.cs +++ b/src/Spring/Spring.Core/Objects/FatalObjectException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Objects; diff --git a/src/Spring/Spring.Core/Objects/IEventHandlerValue.cs b/src/Spring/Spring.Core/Objects/IEventHandlerValue.cs index 860a5617..5560c620 100644 --- a/src/Spring/Spring.Core/Objects/IEventHandlerValue.cs +++ b/src/Spring/Spring.Core/Objects/IEventHandlerValue.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects; /// diff --git a/src/Spring/Spring.Core/Objects/IMergable.cs b/src/Spring/Spring.Core/Objects/IMergable.cs index 7ac8e7d0..18a92567 100644 --- a/src/Spring/Spring.Core/Objects/IMergable.cs +++ b/src/Spring/Spring.Core/Objects/IMergable.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects; /// diff --git a/src/Spring/Spring.Core/Objects/IObjectMetadataElement.cs b/src/Spring/Spring.Core/Objects/IObjectMetadataElement.cs index 25163a88..f37d7f6b 100644 --- a/src/Spring/Spring.Core/Objects/IObjectMetadataElement.cs +++ b/src/Spring/Spring.Core/Objects/IObjectMetadataElement.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects; /// diff --git a/src/Spring/Spring.Core/Objects/IObjectWrapper.cs b/src/Spring/Spring.Core/Objects/IObjectWrapper.cs index 4cd8ad51..0c6297b6 100644 --- a/src/Spring/Spring.Core/Objects/IObjectWrapper.cs +++ b/src/Spring/Spring.Core/Objects/IObjectWrapper.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using Spring.Core; diff --git a/src/Spring/Spring.Core/Objects/IPropertyValues.cs b/src/Spring/Spring.Core/Objects/IPropertyValues.cs index ece93d2d..88f11c16 100644 --- a/src/Spring/Spring.Core/Objects/IPropertyValues.cs +++ b/src/Spring/Spring.Core/Objects/IPropertyValues.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; namespace Spring.Objects; diff --git a/src/Spring/Spring.Core/Objects/ISharedStateAware.cs b/src/Spring/Spring.Core/Objects/ISharedStateAware.cs index 4bbeec5d..35bbc016 100644 --- a/src/Spring/Spring.Core/Objects/ISharedStateAware.cs +++ b/src/Spring/Spring.Core/Objects/ISharedStateAware.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; namespace Spring.Objects; diff --git a/src/Spring/Spring.Core/Objects/ISharedStateFactory.cs b/src/Spring/Spring.Core/Objects/ISharedStateFactory.cs index bfe857a5..5369a293 100644 --- a/src/Spring/Spring.Core/Objects/ISharedStateFactory.cs +++ b/src/Spring/Spring.Core/Objects/ISharedStateFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; namespace Spring.Objects; diff --git a/src/Spring/Spring.Core/Objects/MutablePropertyValues.cs b/src/Spring/Spring.Core/Objects/MutablePropertyValues.cs index 07eb8729..aecfa185 100644 --- a/src/Spring/Spring.Core/Objects/MutablePropertyValues.cs +++ b/src/Spring/Spring.Core/Objects/MutablePropertyValues.cs @@ -350,8 +350,6 @@ public class MutablePropertyValues : IPropertyValues return PropertyValues.GetEnumerator(); } - // CLOVER:OFF - /// /// Convert the object to a string representation. /// diff --git a/src/Spring/Spring.Core/Objects/ObjectMetadataAttribute.cs b/src/Spring/Spring.Core/Objects/ObjectMetadataAttribute.cs index bc325069..f89075e7 100644 --- a/src/Spring/Spring.Core/Objects/ObjectMetadataAttribute.cs +++ b/src/Spring/Spring.Core/Objects/ObjectMetadataAttribute.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Diagnostics; using Spring.Util; diff --git a/src/Spring/Spring.Core/Objects/ObjectMetadataAttributeAccessor.cs b/src/Spring/Spring.Core/Objects/ObjectMetadataAttributeAccessor.cs index 7ff1d0b8..7c6e9704 100644 --- a/src/Spring/Spring.Core/Objects/ObjectMetadataAttributeAccessor.cs +++ b/src/Spring/Spring.Core/Objects/ObjectMetadataAttributeAccessor.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Core; namespace Spring.Objects; diff --git a/src/Spring/Spring.Core/Objects/ObjectsException.cs b/src/Spring/Spring.Core/Objects/ObjectsException.cs index de9f675a..6ced0034 100644 --- a/src/Spring/Spring.Core/Objects/ObjectsException.cs +++ b/src/Spring/Spring.Core/Objects/ObjectsException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Objects; @@ -30,8 +26,6 @@ namespace Spring.Objects; [Serializable] public class ObjectsException : ApplicationException { - #region Constructor (s) / Destructor - /// Creates a new instance of the ObjectsException class. public ObjectsException() { @@ -78,6 +72,4 @@ public class ObjectsException : ApplicationException : base(info, context) { } - - #endregion } diff --git a/src/Spring/Spring.Core/Objects/PropertyAccessExceptionsException.cs b/src/Spring/Spring.Core/Objects/PropertyAccessExceptionsException.cs index beab5ec9..4ad7ac51 100644 --- a/src/Spring/Spring.Core/Objects/PropertyAccessExceptionsException.cs +++ b/src/Spring/Spring.Core/Objects/PropertyAccessExceptionsException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Runtime.Serialization; using System.Security.Permissions; using System.Text; using Spring.Core; -#endregion - namespace Spring.Objects; /// @@ -50,15 +42,9 @@ namespace Spring.Objects; [Serializable] public class PropertyAccessExceptionsException : ObjectsException { - #region Constants - private static PropertyAccessException[] EmptyPropertyAccessExceptions = new PropertyAccessException[] { }; - #endregion - - #region Constructor (s) / Destructor - /// /// Creates a new instance of the PropertyAccessExceptionsException class. /// @@ -120,8 +106,6 @@ public class PropertyAccessExceptionsException : ObjectsException { } - #endregion - /// /// Return the that generated /// this exception. diff --git a/src/Spring/Spring.Core/Objects/PropertyValue.cs b/src/Spring/Spring.Core/Objects/PropertyValue.cs index 565c2b02..bb35d65a 100644 --- a/src/Spring/Spring.Core/Objects/PropertyValue.cs +++ b/src/Spring/Spring.Core/Objects/PropertyValue.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using Spring.Core; using Spring.Expressions; diff --git a/src/Spring/Spring.Core/Objects/Support/AbstractEventHandlerValue.cs b/src/Spring/Spring.Core/Objects/Support/AbstractEventHandlerValue.cs index 53d01deb..820bac85 100644 --- a/src/Spring/Spring.Core/Objects/Support/AbstractEventHandlerValue.cs +++ b/src/Spring/Spring.Core/Objects/Support/AbstractEventHandlerValue.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using Spring.Util; @@ -29,8 +25,6 @@ namespace Spring.Objects.Support; /// Rick Evans public abstract class AbstractEventHandlerValue : IEventHandlerValue { - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// class. @@ -63,10 +57,6 @@ public abstract class AbstractEventHandlerValue : IEventHandlerValue _methodName = methodName; } - #endregion - - #region Properties - /// /// The source of the event (may be unresolved, as in the case /// of a @@ -114,10 +104,6 @@ public abstract class AbstractEventHandlerValue : IEventHandlerValue } } - #endregion - - #region Methods - /// /// Wires up the specified handler to the named event on the /// supplied event source. @@ -143,13 +129,7 @@ public abstract class AbstractEventHandlerValue : IEventHandlerValue "{0} [Source = '{1}', Method = '{2}']", GetType().FullName, Source, MethodName); } - #endregion - - #region Fields - private object _source; private string _methodName; private string _eventName; - - #endregion } diff --git a/src/Spring/Spring.Core/Objects/Support/AbstractSharedStateFactory.cs b/src/Spring/Spring.Core/Objects/Support/AbstractSharedStateFactory.cs index 19e82995..07949488 100644 --- a/src/Spring/Spring.Core/Objects/Support/AbstractSharedStateFactory.cs +++ b/src/Spring/Spring.Core/Objects/Support/AbstractSharedStateFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Spring.Collections; using Spring.Core; diff --git a/src/Spring/Spring.Core/Objects/Support/AbstractWiringEventHandlerValue.cs b/src/Spring/Spring.Core/Objects/Support/AbstractWiringEventHandlerValue.cs index 12de5817..0f3b697b 100644 --- a/src/Spring/Spring.Core/Objects/Support/AbstractWiringEventHandlerValue.cs +++ b/src/Spring/Spring.Core/Objects/Support/AbstractWiringEventHandlerValue.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using System.Reflection; using Spring.Util; @@ -31,8 +27,6 @@ namespace Spring.Objects.Support; /// Rick Evans public abstract class AbstractWiringEventHandlerValue : AbstractEventHandlerValue { - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// class. @@ -66,10 +60,6 @@ public abstract class AbstractWiringEventHandlerValue : AbstractEventHandlerValu { } - #endregion - - #region Methods - /// /// Wires up the specified handler to the named event on the /// supplied event source. @@ -133,8 +123,6 @@ public abstract class AbstractWiringEventHandlerValue : AbstractEventHandlerValu new DelegateInfo(delegateType).GetParameterTypes(), null); - #region Sanity Check - if (method == null) { throw new FatalObjectException(string.Format( @@ -143,10 +131,6 @@ public abstract class AbstractWiringEventHandlerValue : AbstractEventHandlerValu MethodName, handlerType)); } - #endregion - return method; } - - #endregion } diff --git a/src/Spring/Spring.Core/Objects/Support/ArgumentConvertingMethodInvoker.cs b/src/Spring/Spring.Core/Objects/Support/ArgumentConvertingMethodInvoker.cs index 188c630a..8f5d3b59 100644 --- a/src/Spring/Spring.Core/Objects/Support/ArgumentConvertingMethodInvoker.cs +++ b/src/Spring/Spring.Core/Objects/Support/ArgumentConvertingMethodInvoker.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.ComponentModel; using Spring.Core.TypeConversion; using Spring.Util; @@ -34,8 +30,6 @@ namespace Spring.Objects.Support; /// public class ArgumentConvertingMethodInvoker : MethodInvoker { - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// class. @@ -44,19 +38,11 @@ public class ArgumentConvertingMethodInvoker : MethodInvoker { } - #endregion - - #region Properties - private ObjectWrapper Wrapper { get { return _wrapper; } } - #endregion - - #region Methods - /// /// Prepare the specified method. /// @@ -102,11 +88,5 @@ public class ArgumentConvertingMethodInvoker : MethodInvoker TypeConverterRegistry.RegisterConverter(requiredType, typeConverter); } - #endregion - - #region Fields - private readonly ObjectWrapper _wrapper = new ObjectWrapper(); - - #endregion } diff --git a/src/Spring/Spring.Core/Objects/Support/AutoWiringEventHandlerValue.cs b/src/Spring/Spring.Core/Objects/Support/AutoWiringEventHandlerValue.cs index ddd7cb48..39d71282 100644 --- a/src/Spring/Spring.Core/Objects/Support/AutoWiringEventHandlerValue.cs +++ b/src/Spring/Spring.Core/Objects/Support/AutoWiringEventHandlerValue.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using System.Reflection; using Microsoft.Extensions.Logging; @@ -33,8 +29,6 @@ namespace Spring.Objects.Support; /// Rick Evans public class AutoWiringEventHandlerValue : AbstractEventHandlerValue { - #region Constants - private const string EventNamePlaceHolder = "${event}"; private const string DefaultMethodPrefix = "On"; @@ -43,10 +37,6 @@ public class AutoWiringEventHandlerValue : AbstractEventHandlerValue private static readonly ILogger log = LogManager.GetLogger(); - #endregion - - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// class. @@ -56,10 +46,6 @@ public class AutoWiringEventHandlerValue : AbstractEventHandlerValue MethodName = DefaultMethodName; } - #endregion - - #region Properties - /// /// The name of the method that is going to handle the event. /// @@ -69,10 +55,6 @@ public class AutoWiringEventHandlerValue : AbstractEventHandlerValue set { base.MethodName = StringUtils.HasText(value) ? value.Trim() : DefaultMethodName; } } - #endregion - - #region Methods - /// /// Wires up the specified handler to the named event on the supplied event source. /// @@ -93,10 +75,6 @@ public class AutoWiringEventHandlerValue : AbstractEventHandlerValue wirer.Wire(); } - #endregion - - #region Inner Class : AutoWirer - /// /// Performs the matching up of handler methods to one or more source events. /// @@ -115,8 +93,6 @@ public class AutoWiringEventHandlerValue : AbstractEventHandlerValue /// private sealed class AutoWirer { - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// class. @@ -142,10 +118,6 @@ public class AutoWiringEventHandlerValue : AbstractEventHandlerValue MethodName = methodName; } - #endregion - - #region Methods - /// /// Wires up events on the source to methods exposed on the handler. /// @@ -202,8 +174,6 @@ public class AutoWiringEventHandlerValue : AbstractEventHandlerValue // and for each method that satisfied the criteria... foreach (MethodInfo method in methods) { - #region Instrumentation - if (log.IsEnabled(LogLevel.Debug)) { log.LogDebug(string.Format( @@ -213,8 +183,6 @@ public class AutoWiringEventHandlerValue : AbstractEventHandlerValue theEvent.Name)); } - #endregion - IEventHandlerValue myHandler = method.IsStatic ? new StaticEventHandlerValue() : (IEventHandlerValue) new InstanceEventHandlerValue(); myHandler.EventName = theEvent.Name; myHandler.MethodName = method.Name; @@ -240,10 +208,6 @@ public class AutoWiringEventHandlerValue : AbstractEventHandlerValue return methodName; } - #endregion - - #region Properties - /// /// The object exposing the event (s) being wired up. /// @@ -296,18 +260,10 @@ public class AutoWiringEventHandlerValue : AbstractEventHandlerValue set { _eventName = value; } } - #endregion - - #region Fields - private object _source; private object _handler; private string _methodName; private string _eventName; private Type _handlerType; - - #endregion } - - #endregion } diff --git a/src/Spring/Spring.Core/Objects/Support/ByTypeSharedStateFactory.cs b/src/Spring/Spring.Core/Objects/Support/ByTypeSharedStateFactory.cs index 08924acc..c0bfca16 100644 --- a/src/Spring/Spring.Core/Objects/Support/ByTypeSharedStateFactory.cs +++ b/src/Spring/Spring.Core/Objects/Support/ByTypeSharedStateFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Support; /// diff --git a/src/Spring/Spring.Core/Objects/Support/ISortDefinition.cs b/src/Spring/Spring.Core/Objects/Support/ISortDefinition.cs index cad1a6f3..e8b61721 100644 --- a/src/Spring/Spring.Core/Objects/Support/ISortDefinition.cs +++ b/src/Spring/Spring.Core/Objects/Support/ISortDefinition.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Support; /// diff --git a/src/Spring/Spring.Core/Objects/Support/InstanceEventHandlerValue.cs b/src/Spring/Spring.Core/Objects/Support/InstanceEventHandlerValue.cs index fa8a9599..cdcdd603 100644 --- a/src/Spring/Spring.Core/Objects/Support/InstanceEventHandlerValue.cs +++ b/src/Spring/Spring.Core/Objects/Support/InstanceEventHandlerValue.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using Spring.Util; @@ -29,16 +25,10 @@ namespace Spring.Objects.Support; /// Rick Evans public class InstanceEventHandlerValue : AbstractWiringEventHandlerValue { - #region Constants - private static readonly BindingFlags InstanceMethodFlags = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.IgnoreCase | BindingFlags.Static; - #endregion - - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// class. @@ -62,10 +52,6 @@ public class InstanceEventHandlerValue : AbstractWiringEventHandlerValue { } - #endregion - - #region Methods - /// /// Gets the event handler. /// @@ -105,6 +91,4 @@ public class InstanceEventHandlerValue : AbstractWiringEventHandlerValue return callback; } - - #endregion } diff --git a/src/Spring/Spring.Core/Objects/Support/MethodInvoker.cs b/src/Spring/Spring.Core/Objects/Support/MethodInvoker.cs index 19d39bf7..921a58c3 100644 --- a/src/Spring/Spring.Core/Objects/Support/MethodInvoker.cs +++ b/src/Spring/Spring.Core/Objects/Support/MethodInvoker.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Globalization; using System.Reflection; @@ -79,8 +75,6 @@ namespace Spring.Objects.Support; /// Simon White (.NET) public class MethodInvoker { - #region Fields - /// /// The value returned from the invocation of a method that returns void. /// @@ -109,10 +103,6 @@ public class MethodInvoker BindingFlags.NonPublic | BindingFlags.IgnoreCase; - #endregion - - #region Constructor (s) / Destructor - /// /// Creates a new instance of the class. /// @@ -123,10 +113,6 @@ public class MethodInvoker PreparedArguments = new object[] { }; } - #endregion - - #region Properties - /// /// The target on which to call the target method. /// @@ -277,10 +263,6 @@ public class MethodInvoker } } - #endregion - - #region Methods - /// /// Prepare the specified method. /// @@ -539,6 +521,4 @@ public class MethodInvoker return (result == null ? Void : result); } - - #endregion } diff --git a/src/Spring/Spring.Core/Objects/Support/MutableSortDefinition.cs b/src/Spring/Spring.Core/Objects/Support/MutableSortDefinition.cs index 5f3e1e64..20d12360 100644 --- a/src/Spring/Spring.Core/Objects/Support/MutableSortDefinition.cs +++ b/src/Spring/Spring.Core/Objects/Support/MutableSortDefinition.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Util; namespace Spring.Objects.Support; @@ -38,8 +34,6 @@ public class MutableSortDefinition : ISortDefinition private bool _ascending = true; private bool _toggleAscendingOnProperty = false; - #region Properties - private bool ToggleAscendingOnProperty { get @@ -52,10 +46,6 @@ public class MutableSortDefinition : ISortDefinition } } - #endregion - - #region ISortDefinition Properties - /// /// The name of the property to sort by. /// @@ -115,10 +105,6 @@ public class MutableSortDefinition : ISortDefinition } } - #endregion - - #region Constructors - /// /// Creates a new instance of the /// class. @@ -179,10 +165,6 @@ public class MutableSortDefinition : ISortDefinition this.ToggleAscendingOnProperty = toggleAscendingOnSameProperty; } - #endregion - - #region Methods - /// /// Overrides the default method /// @@ -216,6 +198,4 @@ public class MutableSortDefinition : ISortDefinition result = 29 * result + (this.Ascending ? 1 : 0); return result; } - - #endregion } diff --git a/src/Spring/Spring.Core/Objects/Support/PropertyComparator.cs b/src/Spring/Spring.Core/Objects/Support/PropertyComparator.cs index 65f542eb..41c7d231 100644 --- a/src/Spring/Spring.Core/Objects/Support/PropertyComparator.cs +++ b/src/Spring/Spring.Core/Objects/Support/PropertyComparator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Globalization; using Microsoft.Extensions.Logging; @@ -117,16 +113,12 @@ public class PropertyComparator : IComparer } catch (Exception ex) { - #region Instrumentation - if (logger.IsEnabled(LogLevel.Warning)) { string message = "Could not sort objects [" + o1 + "] and [" + o2 + "]"; logger.LogWarning(ex, message); } - #endregion - return 0; } diff --git a/src/Spring/Spring.Core/Objects/Support/StaticEventHandlerValue.cs b/src/Spring/Spring.Core/Objects/Support/StaticEventHandlerValue.cs index 4a8f0936..a1810ac7 100644 --- a/src/Spring/Spring.Core/Objects/Support/StaticEventHandlerValue.cs +++ b/src/Spring/Spring.Core/Objects/Support/StaticEventHandlerValue.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using System.Reflection; @@ -29,16 +25,10 @@ namespace Spring.Objects.Support; /// Rick Evans public class StaticEventHandlerValue : AbstractWiringEventHandlerValue { - #region Constants - private static readonly BindingFlags StaticMethodFlags = BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.IgnoreCase; - #endregion - - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// class. @@ -62,10 +52,6 @@ public class StaticEventHandlerValue : AbstractWiringEventHandlerValue { } - #endregion - - #region Methods - /// /// Gets the event handler. /// @@ -95,6 +81,4 @@ public class StaticEventHandlerValue : AbstractWiringEventHandlerValue StaticEventHandlerValue.StaticMethodFlags); return Delegate.CreateDelegate(info.EventHandlerType, method); } - - #endregion } diff --git a/src/Spring/Spring.Core/Pool/IObjectPool.cs b/src/Spring/Spring.Core/Pool/IObjectPool.cs index b34fb7e6..c8349e78 100644 --- a/src/Spring/Spring.Core/Pool/IObjectPool.cs +++ b/src/Spring/Spring.Core/Pool/IObjectPool.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Pool; /// diff --git a/src/Spring/Spring.Core/Pool/IPoolableObjectFactory.cs b/src/Spring/Spring.Core/Pool/IPoolableObjectFactory.cs index ebf77806..0d9fe4ae 100644 --- a/src/Spring/Spring.Core/Pool/IPoolableObjectFactory.cs +++ b/src/Spring/Spring.Core/Pool/IPoolableObjectFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Pool; /// diff --git a/src/Spring/Spring.Core/Pool/PoolException.cs b/src/Spring/Spring.Core/Pool/PoolException.cs index b85a4c9c..579584e3 100644 --- a/src/Spring/Spring.Core/Pool/PoolException.cs +++ b/src/Spring/Spring.Core/Pool/PoolException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Pool; diff --git a/src/Spring/Spring.Core/Pool/Support/SimplePool.cs b/src/Spring/Spring.Core/Pool/Support/SimplePool.cs index 29707ed5..e898a5b5 100644 --- a/src/Spring/Spring.Core/Pool/Support/SimplePool.cs +++ b/src/Spring/Spring.Core/Pool/Support/SimplePool.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using Spring.Util; using Spring.Threading; -#endregion - namespace Spring.Pool.Support; /// diff --git a/src/Spring/Spring.Core/Proxy/AbstractProxyMethodBuilder.cs b/src/Spring/Spring.Core/Proxy/AbstractProxyMethodBuilder.cs index 0fa59745..b610b2a4 100644 --- a/src/Spring/Spring.Core/Proxy/AbstractProxyMethodBuilder.cs +++ b/src/Spring/Spring.Core/Proxy/AbstractProxyMethodBuilder.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using System.Reflection.Emit; using Spring.Util; -#endregion - namespace Spring.Proxy; /// @@ -34,8 +26,6 @@ namespace Spring.Proxy; /// Bruno Baia public abstract class AbstractProxyMethodBuilder : IProxyMethodBuilder { - #region Fields - /// /// The type builder to use. /// @@ -51,10 +41,6 @@ public abstract class AbstractProxyMethodBuilder : IProxyMethodBuilder /// protected bool explicitImplementation; - #endregion - - #region Constructor(s) / Destructor - /// /// Creates a new instance of the method builder. /// @@ -74,10 +60,6 @@ public abstract class AbstractProxyMethodBuilder : IProxyMethodBuilder this.explicitImplementation = explicitImplementation; } - #endregion - - #region IProxyMethodBuilder Members - /// /// Dynamically builds proxy method. /// @@ -108,10 +90,6 @@ public abstract class AbstractProxyMethodBuilder : IProxyMethodBuilder return methodBuilder; } - #endregion - - #region Protected Methods - /// /// Generates the IL instructions that pushes /// the proxy instance on stack. @@ -377,12 +355,8 @@ public abstract class AbstractProxyMethodBuilder : IProxyMethodBuilder il.Emit(OpCodes.Newobj, NewException); il.Emit(OpCodes.Throw); } - - #endregion } -#region References helper class definition - internal struct References { // methods @@ -391,6 +365,4 @@ internal struct References public static readonly MethodInfo UnderstandsMethod = typeof(AssertUtils).GetMethod("Understands", new Type[] { typeof(object), typeof(string), typeof(Type) }); -} - -#endregion +} \ No newline at end of file diff --git a/src/Spring/Spring.Core/Proxy/AbstractProxyTypeBuilder.cs b/src/Spring/Spring.Core/Proxy/AbstractProxyTypeBuilder.cs index 737b3b00..7a475684 100644 --- a/src/Spring/Spring.Core/Proxy/AbstractProxyTypeBuilder.cs +++ b/src/Spring/Spring.Core/Proxy/AbstractProxyTypeBuilder.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Reflection; using System.Reflection.Emit; @@ -28,8 +22,6 @@ using Microsoft.Extensions.Logging; using Spring.Core.TypeResolution; using Spring.Util; -#endregion - namespace Spring.Proxy; /// @@ -48,8 +40,6 @@ namespace Spring.Proxy; /// Bruno Baia public abstract class AbstractProxyTypeBuilder : IProxyTypeBuilder, IProxyTypeGenerator { - #region Fields - /// /// The shared instance for this class (and derived classes). /// @@ -65,10 +55,6 @@ public abstract class AbstractProxyTypeBuilder : IProxyTypeBuilder, IProxyTypeGe private IList _typeAttributes = new ArrayList(); private IDictionary _memberAttributes = new Hashtable(); - #endregion - - #region IProxyTypeBuilder Members - /// /// Creates the proxy type. /// @@ -171,10 +157,6 @@ public abstract class AbstractProxyTypeBuilder : IProxyTypeBuilder, IProxyTypeGe set { _memberAttributes = value; } } - #endregion - - #region IProxyTypeGenerator Members - /// /// Generates the IL instructions that pushes /// the proxy instance on stack. @@ -192,12 +174,6 @@ public abstract class AbstractProxyTypeBuilder : IProxyTypeBuilder, IProxyTypeGe /// The IL generator to use. public abstract void PushTarget(ILGenerator il); - #endregion - - #region Protected Methods - - #region Type generation - /// /// Creates an appropriate type builder. /// @@ -213,10 +189,6 @@ public abstract class AbstractProxyTypeBuilder : IProxyTypeBuilder, IProxyTypeGe return DynamicProxyManager.CreateTypeBuilder(typeName, baseType); } - #endregion - - #region Attributes generation - /// /// Applies attributes to the proxy class. /// @@ -543,10 +515,6 @@ public abstract class AbstractProxyTypeBuilder : IProxyTypeBuilder, IProxyTypeGe private static readonly FieldInfo CustomAttributeConstructorField = typeof(CustomAttributeBuilder).GetField("m_con", BindingFlags.Instance | BindingFlags.NonPublic); - #endregion - - #region Constructors generation - /// /// Defines the types of the parameters for the specified constructor. /// @@ -595,10 +563,6 @@ public abstract class AbstractProxyTypeBuilder : IProxyTypeBuilder, IProxyTypeGe { } - #endregion - - #region Members generation - /// /// Implements an interface. /// @@ -877,8 +841,6 @@ public abstract class AbstractProxyTypeBuilder : IProxyTypeBuilder, IProxyTypeGe } } - #endregion - /// /// Returns an array of s that represent /// the proxiable interfaces. @@ -935,6 +897,4 @@ public abstract class AbstractProxyTypeBuilder : IProxyTypeBuilder, IProxyTypeGe { return intf == typeof(ISerializable); } - - #endregion } diff --git a/src/Spring/Spring.Core/Proxy/BaseProxyMethodBuilder.cs b/src/Spring/Spring.Core/Proxy/BaseProxyMethodBuilder.cs index 7eaaca76..3ef6a45d 100644 --- a/src/Spring/Spring.Core/Proxy/BaseProxyMethodBuilder.cs +++ b/src/Spring/Spring.Core/Proxy/BaseProxyMethodBuilder.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using System.Reflection.Emit; -#endregion - namespace Spring.Proxy; /// @@ -33,8 +25,6 @@ namespace Spring.Proxy; /// Bruno Baia public class BaseProxyMethodBuilder : AbstractProxyMethodBuilder { - #region Constructor(s) / Destructor - /// /// Creates a new instance of the method builder. /// @@ -52,10 +42,6 @@ public class BaseProxyMethodBuilder : AbstractProxyMethodBuilder { } - #endregion - - #region Protected Methods - /// /// Generates the proxy method. /// @@ -69,6 +55,4 @@ public class BaseProxyMethodBuilder : AbstractProxyMethodBuilder { CallDirectBaseMethod(il, method); } - - #endregion } diff --git a/src/Spring/Spring.Core/Proxy/CompositionProxyTypeBuilder.cs b/src/Spring/Spring.Core/Proxy/CompositionProxyTypeBuilder.cs index 9cef79a7..d39fecc8 100644 --- a/src/Spring/Spring.Core/Proxy/CompositionProxyTypeBuilder.cs +++ b/src/Spring/Spring.Core/Proxy/CompositionProxyTypeBuilder.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using System.Reflection.Emit; -#endregion - namespace Spring.Proxy; /// @@ -40,8 +32,6 @@ namespace Spring.Proxy; /// Bruno Baia public class CompositionProxyTypeBuilder : AbstractProxyTypeBuilder { - #region Fields - private bool explicitInterfaceImplementation = false; /// @@ -49,10 +39,6 @@ public class CompositionProxyTypeBuilder : AbstractProxyTypeBuilder /// protected FieldBuilder targetInstance; - #endregion - - #region Properties - /// /// Gets or sets a value indicating whether interfaces should be implemented explicitly. /// @@ -65,10 +51,6 @@ public class CompositionProxyTypeBuilder : AbstractProxyTypeBuilder set { explicitInterfaceImplementation = value; } } - #endregion - - #region Constructor(s) / Destructor - /// /// Creates a new instance of the /// class. @@ -78,10 +60,6 @@ public class CompositionProxyTypeBuilder : AbstractProxyTypeBuilder Name = "CompositionProxy"; } - #endregion - - #region IProxyTypeBuilder Members - /// /// Creates a proxy that delegates calls to an instance of the /// target object. @@ -137,8 +115,6 @@ public class CompositionProxyTypeBuilder : AbstractProxyTypeBuilder return new TargetProxyMethodBuilder(typeBuilder, this, explicitInterfaceImplementation); } - #endregion - /// /// Allows subclasses to generate additional code /// @@ -146,8 +122,6 @@ public class CompositionProxyTypeBuilder : AbstractProxyTypeBuilder { } - #region IProxyTypeGenerator Members - /// /// Generates the IL instructions that pushes /// the target instance on which calls should be delegated to. @@ -159,10 +133,6 @@ public class CompositionProxyTypeBuilder : AbstractProxyTypeBuilder il.Emit(OpCodes.Ldfld, targetInstance); } - #endregion - - #region Protected Methods - /// /// Deaclares a field that holds the target object instance. /// @@ -199,6 +169,4 @@ public class CompositionProxyTypeBuilder : AbstractProxyTypeBuilder il.Emit(OpCodes.Newobj, constructor); il.Emit(OpCodes.Stfld, targetInstance); } - - #endregion } diff --git a/src/Spring/Spring.Core/Proxy/DynamicProxyManager.cs b/src/Spring/Spring.Core/Proxy/DynamicProxyManager.cs index ea5ff823..e2366232 100644 --- a/src/Spring/Spring.Core/Proxy/DynamicProxyManager.cs +++ b/src/Spring/Spring.Core/Proxy/DynamicProxyManager.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Diagnostics; using System.Reflection; using System.Reflection.Emit; using Spring.Util; -#endregion - namespace Spring.Proxy; /// @@ -36,8 +28,6 @@ namespace Spring.Proxy; /// Bruno Baia public sealed class DynamicProxyManager { - #region Fields - /// /// The name of the assembly that defines proxy types created. /// @@ -48,10 +38,6 @@ public sealed class DynamicProxyManager /// private const TypeAttributes TYPE_ATTRIBUTES = TypeAttributes.BeforeFieldInit | TypeAttributes.Public; - #endregion - - #region Public Methods - /// /// Creates an appropriate type builder. /// @@ -97,6 +83,4 @@ public sealed class DynamicProxyManager { DynamicCodeManager.SaveAssembly(ASSEMBLY_NAME); } - - #endregion } diff --git a/src/Spring/Spring.Core/Proxy/IProxyMethodBuilder.cs b/src/Spring/Spring.Core/Proxy/IProxyMethodBuilder.cs index 432dd5e1..4cb6796e 100644 --- a/src/Spring/Spring.Core/Proxy/IProxyMethodBuilder.cs +++ b/src/Spring/Spring.Core/Proxy/IProxyMethodBuilder.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using System.Reflection.Emit; -#endregion - namespace Spring.Proxy; /// diff --git a/src/Spring/Spring.Core/Proxy/IProxyTypeBuilder.cs b/src/Spring/Spring.Core/Proxy/IProxyTypeBuilder.cs index 5177bf7c..c659312d 100644 --- a/src/Spring/Spring.Core/Proxy/IProxyTypeBuilder.cs +++ b/src/Spring/Spring.Core/Proxy/IProxyTypeBuilder.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; -#endregion - namespace Spring.Proxy; /// diff --git a/src/Spring/Spring.Core/Proxy/IProxyTypeGenerator.cs b/src/Spring/Spring.Core/Proxy/IProxyTypeGenerator.cs index 9066e187..4383a7e7 100644 --- a/src/Spring/Spring.Core/Proxy/IProxyTypeGenerator.cs +++ b/src/Spring/Spring.Core/Proxy/IProxyTypeGenerator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -36,8 +30,6 @@ * limitations under the License. */ -#endregion - using System.Reflection.Emit; namespace Spring.Proxy; diff --git a/src/Spring/Spring.Core/Proxy/InheritanceProxyTypeBuilder.cs b/src/Spring/Spring.Core/Proxy/InheritanceProxyTypeBuilder.cs index 60d023e9..06936842 100644 --- a/src/Spring/Spring.Core/Proxy/InheritanceProxyTypeBuilder.cs +++ b/src/Spring/Spring.Core/Proxy/InheritanceProxyTypeBuilder.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using System.Reflection.Emit; @@ -36,14 +32,8 @@ namespace Spring.Proxy; /// Bruno Baia public class InheritanceProxyTypeBuilder : AbstractProxyTypeBuilder { - #region Fields - private bool declaredMembersOnly = false; - #endregion - - #region Properties - /// /// Gets or sets a value indicating whether inherited members should be proxied. /// @@ -56,10 +46,6 @@ public class InheritanceProxyTypeBuilder : AbstractProxyTypeBuilder set { declaredMembersOnly = value; } } - #endregion - - #region Constructor(s) / Destructor - /// /// Creates a new instance of the /// class. @@ -70,10 +56,6 @@ public class InheritanceProxyTypeBuilder : AbstractProxyTypeBuilder //ProxyTargetAttributes = false; } - #endregion - - #region IProxyTypeBuilder Members - /// /// Creates a proxy that inherits the proxied object's class. /// @@ -120,10 +102,6 @@ public class InheritanceProxyTypeBuilder : AbstractProxyTypeBuilder return typeBuilder.CreateTypeInfo(); } - #endregion - - #region IProxyTypeGenerator Members - /// /// Generates the IL instructions that pushes /// the target instance on which calls should be delegated to. @@ -134,10 +112,6 @@ public class InheritanceProxyTypeBuilder : AbstractProxyTypeBuilder PushProxy(il); } - #endregion - - #region Protected Methods - /// /// Generates the proxy constructor. /// @@ -163,6 +137,4 @@ public class InheritanceProxyTypeBuilder : AbstractProxyTypeBuilder il.Emit(OpCodes.Call, constructor); } - - #endregion } diff --git a/src/Spring/Spring.Core/Proxy/ProxyIgnoreAttribute.cs b/src/Spring/Spring.Core/Proxy/ProxyIgnoreAttribute.cs index ae6de550..2c482272 100644 --- a/src/Spring/Spring.Core/Proxy/ProxyIgnoreAttribute.cs +++ b/src/Spring/Spring.Core/Proxy/ProxyIgnoreAttribute.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Proxy; /// diff --git a/src/Spring/Spring.Core/Proxy/TargetProxyMethodBuilder.cs b/src/Spring/Spring.Core/Proxy/TargetProxyMethodBuilder.cs index 96c60f97..ec69cc75 100644 --- a/src/Spring/Spring.Core/Proxy/TargetProxyMethodBuilder.cs +++ b/src/Spring/Spring.Core/Proxy/TargetProxyMethodBuilder.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using System.Reflection.Emit; -#endregion - namespace Spring.Proxy; /// @@ -33,8 +25,6 @@ namespace Spring.Proxy; /// Bruno Baia public class TargetProxyMethodBuilder : AbstractProxyMethodBuilder { - #region Constructor(s) / Destructor - /// /// Creates a new instance of the method builder. /// @@ -52,10 +42,6 @@ public class TargetProxyMethodBuilder : AbstractProxyMethodBuilder { } - #endregion - - #region Protected Methods - /// /// Generates the proxy method. /// @@ -88,6 +74,4 @@ public class TargetProxyMethodBuilder : AbstractProxyMethodBuilder il.Emit(OpCodes.Ldloc, returnValue); } } - - #endregion } diff --git a/src/Spring/Spring.Core/Reflection/Dynamic/BaseDynamicMember.cs b/src/Spring/Spring.Core/Reflection/Dynamic/BaseDynamicMember.cs index 6c6b6d61..35267969 100644 --- a/src/Spring/Spring.Core/Reflection/Dynamic/BaseDynamicMember.cs +++ b/src/Spring/Spring.Core/Reflection/Dynamic/BaseDynamicMember.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using System.Reflection.Emit; diff --git a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicConstructor.cs b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicConstructor.cs index ea603910..1f85e446 100644 --- a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicConstructor.cs +++ b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicConstructor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,11 @@ * limitations under the License. */ -#endregion - using System.Reflection; using Spring.Util; namespace Spring.Reflection.Dynamic; -#region IDynamicConstructor interface - /// /// Defines constructors that dynamic constructor class has to implement. /// @@ -42,10 +36,6 @@ public interface IDynamicConstructor object Invoke(object[] arguments); } -#endregion - -#region Safe wrapper - /// /// Safe wrapper for the dynamic constructor. /// @@ -58,8 +48,6 @@ public class SafeConstructor : IDynamicConstructor { private ConstructorInfo constructorInfo; - #region Generated Function Cache - private static readonly IDictionary constructorCache = new Dictionary(); /// @@ -80,8 +68,6 @@ public class SafeConstructor : IDynamicConstructor return method; } - #endregion - private ConstructorDelegate constructor; /// @@ -109,8 +95,6 @@ public class SafeConstructor : IDynamicConstructor } } -#endregion - /// /// Factory class for dynamic constructors. /// diff --git a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicField.cs b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicField.cs index f87ea047..1086011d 100644 --- a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicField.cs +++ b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicField.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,11 @@ * limitations under the License. */ -#endregion - using System.Reflection; using Spring.Util; namespace Spring.Reflection.Dynamic; -#region IDynamicField interface - /// /// Defines methods that dynamic field class has to implement. /// @@ -53,10 +47,6 @@ public interface IDynamicField void SetValue(object target, object value); } -#endregion - -#region Safe wrapper - /// /// Safe wrapper for the dynamic field. /// @@ -69,8 +59,6 @@ public class SafeField : IDynamicField { private readonly FieldInfo fieldInfo; - #region Cache - private static readonly IDictionary fieldCache = new Dictionary(); /// @@ -106,8 +94,6 @@ public class SafeField : IDynamicField return fieldInfo; } - #endregion - private readonly FieldGetterDelegate getter; private readonly FieldSetterDelegate setter; @@ -159,8 +145,6 @@ public class SafeField : IDynamicField } } -#endregion - /// /// Factory class for dynamic fields. /// diff --git a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicIndexer.cs b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicIndexer.cs index 9b68d27c..f17b044c 100644 --- a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicIndexer.cs +++ b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicIndexer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Reflection.Dynamic; /// diff --git a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicMethod.cs b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicMethod.cs index 18733eda..b79c8f4f 100644 --- a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicMethod.cs +++ b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicMethod.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,12 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Reflection; using Spring.Util; namespace Spring.Reflection.Dynamic; -#region IDynamicMethod interface - /// /// Defines methods that dynamic method class has to implement. /// @@ -46,10 +40,6 @@ public interface IDynamicMethod object Invoke(object target, params object[] arguments); } -#endregion - -#region Safe wrapper - /// /// Safe wrapper for the dynamic method. /// @@ -70,8 +60,6 @@ public class SafeMethod : IDynamicMethod get { return methodInfo.DeclaringType; } } - #region Generated Function Cache - private class SafeMethodState { public readonly FunctionDelegate method; @@ -103,8 +91,6 @@ public class SafeMethod : IDynamicMethod private static readonly Hashtable stateCache = new IdentityTable(); - #endregion - private readonly SafeMethodState state; /// @@ -163,8 +149,6 @@ public class SafeMethod : IDynamicMethod } } -#endregion - /// /// Factory class for dynamic methods. /// diff --git a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicProperty.cs b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicProperty.cs index da771c2d..375b22de 100644 --- a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicProperty.cs +++ b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicProperty.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,11 @@ * limitations under the License. */ -#endregion - using System.Reflection; using Spring.Util; namespace Spring.Reflection.Dynamic; -#region IDynamicProperty interface - /// /// Defines methods that dynamic property class has to implement. /// @@ -77,10 +71,6 @@ public interface IDynamicProperty void SetValue(object target, object value, params object[] index); } -#endregion - -#region Safe wrapper - /// /// Safe wrapper for the dynamic property. /// @@ -93,8 +83,6 @@ public class SafeProperty : IDynamicProperty { private readonly PropertyInfo propertyInfo; - #region Cache - private static readonly IDictionary propertyCache = new Dictionary(); /// @@ -130,8 +118,6 @@ public class SafeProperty : IDynamicProperty return propertyInfo; } - #endregion - private readonly PropertyGetterDelegate getter; private readonly PropertySetterDelegate setter; @@ -216,8 +202,6 @@ public class SafeProperty : IDynamicProperty } } -#endregion - /// /// Factory class for dynamic properties. /// diff --git a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicReflectionManager.cs b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicReflectionManager.cs index a9db06af..70bd4f95 100644 --- a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicReflectionManager.cs +++ b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicReflectionManager.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Reflection; using System.Reflection.Emit; @@ -302,8 +298,6 @@ public sealed class DynamicReflectionManager } */ - #region Shared Code Generation - private static void EmitFieldGetter(ILGenerator il, FieldInfo fieldInfo, bool isInstanceMethod) { if (fieldInfo.IsLiteral) @@ -498,8 +492,6 @@ public sealed class DynamicReflectionManager EmitMethodReturn(il, constructor.DeclaringType); } - #endregion - private static OpCode[] LdArgOpCodes = { OpCodes.Ldarg_0, OpCodes.Ldarg_1, OpCodes.Ldarg_2 }; private static void SetupOutputArgument(ILGenerator il, int paramsArrayPosition, ParameterInfo argInfo, IDictionary outArgs) diff --git a/src/Spring/Spring.Core/Stereotype/ControllerAttribute.cs b/src/Spring/Spring.Core/Stereotype/ControllerAttribute.cs index 04902ec3..033a7597 100644 --- a/src/Spring/Spring.Core/Stereotype/ControllerAttribute.cs +++ b/src/Spring/Spring.Core/Stereotype/ControllerAttribute.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Stereotype; /// diff --git a/src/Spring/Spring.Core/Stereotype/RepositoryAttribute.cs b/src/Spring/Spring.Core/Stereotype/RepositoryAttribute.cs index fd989b39..7cbf9b5e 100644 --- a/src/Spring/Spring.Core/Stereotype/RepositoryAttribute.cs +++ b/src/Spring/Spring.Core/Stereotype/RepositoryAttribute.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Stereotype; /// diff --git a/src/Spring/Spring.Core/Stereotype/ServiceAttribute.cs b/src/Spring/Spring.Core/Stereotype/ServiceAttribute.cs index 351f5e45..df1985fd 100644 --- a/src/Spring/Spring.Core/Stereotype/ServiceAttribute.cs +++ b/src/Spring/Spring.Core/Stereotype/ServiceAttribute.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Stereotype; /// diff --git a/src/Spring/Spring.Core/Threading/ISync.cs b/src/Spring/Spring.Core/Threading/ISync.cs index d9127c92..c9898098 100644 --- a/src/Spring/Spring.Core/Threading/ISync.cs +++ b/src/Spring/Spring.Core/Threading/ISync.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Threading; /// diff --git a/src/Spring/Spring.Core/Threading/Latch.cs b/src/Spring/Spring.Core/Threading/Latch.cs index 476c66af..156efd69 100644 --- a/src/Spring/Spring.Core/Threading/Latch.cs +++ b/src/Spring/Spring.Core/Threading/Latch.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Threading; namespace Spring.Threading; diff --git a/src/Spring/Spring.Core/Threading/LogicalThreadContext.cs b/src/Spring/Spring.Core/Threading/LogicalThreadContext.cs index 0467e9c7..e9777943 100644 --- a/src/Spring/Spring.Core/Threading/LogicalThreadContext.cs +++ b/src/Spring/Spring.Core/Threading/LogicalThreadContext.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Util; -#endregion - namespace Spring.Threading; /// diff --git a/src/Spring/Spring.Core/Threading/Semaphore.cs b/src/Spring/Spring.Core/Threading/Semaphore.cs index c0ed60c1..ebc64192 100644 --- a/src/Spring/Spring.Core/Threading/Semaphore.cs +++ b/src/Spring/Spring.Core/Threading/Semaphore.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Threading; namespace Spring.Threading; diff --git a/src/Spring/Spring.Core/Threading/SyncHolder.cs b/src/Spring/Spring.Core/Threading/SyncHolder.cs index e06cfdba..de9c1f7c 100644 --- a/src/Spring/Spring.Core/Threading/SyncHolder.cs +++ b/src/Spring/Spring.Core/Threading/SyncHolder.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Threading; /// diff --git a/src/Spring/Spring.Core/Threading/ThreadStaticStorage.cs b/src/Spring/Spring.Core/Threading/ThreadStaticStorage.cs index 90dd0762..39f77c29 100644 --- a/src/Spring/Spring.Core/Threading/ThreadStaticStorage.cs +++ b/src/Spring/Spring.Core/Threading/ThreadStaticStorage.cs @@ -1,5 +1,3 @@ -#region License - // /* // * Copyright 2022 the original author or authors. // * @@ -16,8 +14,6 @@ // * limitations under the License. // */ -#endregion - using System.Collections; using System.Threading; diff --git a/src/Spring/Spring.Core/Threading/TimeoutException.cs b/src/Spring/Spring.Core/Threading/TimeoutException.cs index 6f307f02..c888d4e2 100644 --- a/src/Spring/Spring.Core/Threading/TimeoutException.cs +++ b/src/Spring/Spring.Core/Threading/TimeoutException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using System.Threading; diff --git a/src/Spring/Spring.Core/Threading/TimeoutSync.cs b/src/Spring/Spring.Core/Threading/TimeoutSync.cs index 9247c0dc..f1198be3 100644 --- a/src/Spring/Spring.Core/Threading/TimeoutSync.cs +++ b/src/Spring/Spring.Core/Threading/TimeoutSync.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - /* Originally written by Doug Lea and released into the public domain. This may be used for any purposes whatsoever without acknowledgment. diff --git a/src/Spring/Spring.Core/Threading/Utils.cs b/src/Spring/Spring.Core/Threading/Utils.cs index 99378415..206f5249 100644 --- a/src/Spring/Spring.Core/Threading/Utils.cs +++ b/src/Spring/Spring.Core/Threading/Utils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Threading; namespace Spring.Threading; diff --git a/src/Spring/Spring.Core/Util/ArrayUtils.cs b/src/Spring/Spring.Core/Util/ArrayUtils.cs index d84d44e4..788f163e 100644 --- a/src/Spring/Spring.Core/Util/ArrayUtils.cs +++ b/src/Spring/Spring.Core/Util/ArrayUtils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Text; -#endregion - namespace Spring.Util; /// diff --git a/src/Spring/Spring.Core/Util/AssertUtils.cs b/src/Spring/Spring.Core/Util/AssertUtils.cs index 63a9a786..6ec57c23 100644 --- a/src/Spring/Spring.Core/Util/AssertUtils.cs +++ b/src/Spring/Spring.Core/Util/AssertUtils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Reflection; using System.Runtime.CompilerServices; diff --git a/src/Spring/Spring.Core/Util/CompareUtils.cs b/src/Spring/Spring.Core/Util/CompareUtils.cs index 58ad0a8f..c63ed975 100644 --- a/src/Spring/Spring.Core/Util/CompareUtils.cs +++ b/src/Spring/Spring.Core/Util/CompareUtils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Util; /// diff --git a/src/Spring/Spring.Core/Util/ConfigXmlAttribute.cs b/src/Spring/Spring.Core/Util/ConfigXmlAttribute.cs index 46294a68..db5518b2 100644 --- a/src/Spring/Spring.Core/Util/ConfigXmlAttribute.cs +++ b/src/Spring/Spring.Core/Util/ConfigXmlAttribute.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Xml; -#endregion - namespace Spring.Util; /// diff --git a/src/Spring/Spring.Core/Util/ConfigXmlDocument.cs b/src/Spring/Spring.Core/Util/ConfigXmlDocument.cs index 3d165024..1c2a3431 100644 --- a/src/Spring/Spring.Core/Util/ConfigXmlDocument.cs +++ b/src/Spring/Spring.Core/Util/ConfigXmlDocument.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Xml; -#endregion - namespace Spring.Util; /// diff --git a/src/Spring/Spring.Core/Util/ConfigXmlElement.cs b/src/Spring/Spring.Core/Util/ConfigXmlElement.cs index 0ab7000d..90f9dc9c 100644 --- a/src/Spring/Spring.Core/Util/ConfigXmlElement.cs +++ b/src/Spring/Spring.Core/Util/ConfigXmlElement.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Xml; -#endregion - namespace Spring.Util; /// diff --git a/src/Spring/Spring.Core/Util/ConstructorInstantiationInfo.cs b/src/Spring/Spring.Core/Util/ConstructorInstantiationInfo.cs index 4445f292..074140e7 100644 --- a/src/Spring/Spring.Core/Util/ConstructorInstantiationInfo.cs +++ b/src/Spring/Spring.Core/Util/ConstructorInstantiationInfo.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; namespace Spring.Util; diff --git a/src/Spring/Spring.Core/Util/DelegateInfo.cs b/src/Spring/Spring.Core/Util/DelegateInfo.cs index 5d0f9874..05fc618c 100644 --- a/src/Spring/Spring.Core/Util/DelegateInfo.cs +++ b/src/Spring/Spring.Core/Util/DelegateInfo.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; -#endregion - namespace Spring.Util; /// @@ -34,17 +26,11 @@ namespace Spring.Util; /// Rick Evans public sealed class DelegateInfo { - #region Constants - /// /// The method name associated with a delegate invocation. /// private const string InvocationMethod = "Invoke"; - #endregion - - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// class. @@ -77,10 +63,6 @@ public sealed class DelegateInfo DelegateType = type; } - #endregion - - #region Properties - /// /// The of the delegate. /// @@ -98,10 +80,6 @@ public sealed class DelegateInfo } } - #endregion - - #region Methods - /// /// Checks to see if the method encapsulated by the supplied method /// metadata is compatible with the method signature associated with @@ -245,11 +223,5 @@ public sealed class DelegateInfo return compatible; } - #endregion - - #region Fields - private Type _delegateType; - - #endregion } diff --git a/src/Spring/Spring.Core/Util/DynamicCodeManager.cs b/src/Spring/Spring.Core/Util/DynamicCodeManager.cs index 682ec7da..56d52a68 100644 --- a/src/Spring/Spring.Core/Util/DynamicCodeManager.cs +++ b/src/Spring/Spring.Core/Util/DynamicCodeManager.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Diagnostics; using System.Reflection; using System.Reflection.Emit; using Spring.Collections; -#endregion - namespace Spring.Util; /// diff --git a/src/Spring/Spring.Core/Util/EventUtils.cs b/src/Spring/Spring.Core/Util/EventUtils.cs index 921f2224..5487a65c 100644 --- a/src/Spring/Spring.Core/Util/EventUtils.cs +++ b/src/Spring/Spring.Core/Util/EventUtils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Diagnostics; using System.Reflection; using Microsoft.Extensions.Logging; diff --git a/src/Spring/Spring.Core/Util/FatalReflectionException.cs b/src/Spring/Spring.Core/Util/FatalReflectionException.cs index 6b486b23..9f2a0869 100644 --- a/src/Spring/Spring.Core/Util/FatalReflectionException.cs +++ b/src/Spring/Spring.Core/Util/FatalReflectionException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Runtime.Serialization; -#endregion - namespace Spring.Util; /// diff --git a/src/Spring/Spring.Core/Util/Generic/CollectionUtils.cs b/src/Spring/Spring.Core/Util/Generic/CollectionUtils.cs index 30ffc3d4..42fe252f 100644 --- a/src/Spring/Spring.Core/Util/Generic/CollectionUtils.cs +++ b/src/Spring/Spring.Core/Util/Generic/CollectionUtils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Reflection; -#endregion - namespace Spring.Util.Generic; /// @@ -36,8 +28,6 @@ namespace Spring.Util.Generic; /// Mark Pollack (.NET) public sealed class CollectionUtils { - #region Methods - /// /// Determine whether a given collection only contains /// a single unique object @@ -158,6 +148,4 @@ public sealed class CollectionUtils } } } - - #endregion } diff --git a/src/Spring/Spring.Core/Util/IChainableConfigSystem.cs b/src/Spring/Spring.Core/Util/IChainableConfigSystem.cs index 70272e0a..51d3d366 100644 --- a/src/Spring/Spring.Core/Util/IChainableConfigSystem.cs +++ b/src/Spring/Spring.Core/Util/IChainableConfigSystem.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Configuration.Internal; namespace Spring.Util; diff --git a/src/Spring/Spring.Core/Util/IErrorHandler.cs b/src/Spring/Spring.Core/Util/IErrorHandler.cs index bb069852..773a70f5 100644 --- a/src/Spring/Spring.Core/Util/IErrorHandler.cs +++ b/src/Spring/Spring.Core/Util/IErrorHandler.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Util; /// diff --git a/src/Spring/Spring.Core/Util/ITextPosition.cs b/src/Spring/Spring.Core/Util/ITextPosition.cs index 6d3db614..6f3ee7a6 100644 --- a/src/Spring/Spring.Core/Util/ITextPosition.cs +++ b/src/Spring/Spring.Core/Util/ITextPosition.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Util; /// diff --git a/src/Spring/Spring.Core/Util/NumberUtils.cs b/src/Spring/Spring.Core/Util/NumberUtils.cs index 1e51cca6..b852d25a 100644 --- a/src/Spring/Spring.Core/Util/NumberUtils.cs +++ b/src/Spring/Spring.Core/Util/NumberUtils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.ComponentModel; namespace Spring.Util; @@ -555,10 +551,6 @@ public sealed class NumberUtils } } - #region Constructor (s) / Destructor - - // CLOVER:OFF - /// /// Creates a new instance of the class. /// @@ -572,6 +564,4 @@ public sealed class NumberUtils } // CLOVER:ON - - #endregion } diff --git a/src/Spring/Spring.Core/Util/ObjectUtils.cs b/src/Spring/Spring.Core/Util/ObjectUtils.cs index 93ca4c6e..803f2ed4 100644 --- a/src/Spring/Spring.Core/Util/ObjectUtils.cs +++ b/src/Spring/Spring.Core/Util/ObjectUtils.cs @@ -58,8 +58,6 @@ public sealed class ObjectUtils GetHashCodeMethodInfo = type.GetMethod("GetHashCode"); } - // CLOVER:OFF - /// /// Creates a new instance of the class. /// @@ -72,8 +70,6 @@ public sealed class ObjectUtils { } - // CLOVER:ON - /// /// Instantiates the type using the assembly specified to load the type. /// diff --git a/src/Spring/Spring.Core/Util/PathMatcher.cs b/src/Spring/Spring.Core/Util/PathMatcher.cs index 2e651d55..eff35e2c 100644 --- a/src/Spring/Spring.Core/Util/PathMatcher.cs +++ b/src/Spring/Spring.Core/Util/PathMatcher.cs @@ -1,7 +1,5 @@ //// -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -18,15 +16,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Text; using System.Text.RegularExpressions; -#endregion - namespace Spring.Util; /// @@ -208,10 +200,6 @@ public sealed class PathMatcher return true; } - #region Constructor (s) / Destructor - - // CLOVER:OFF - /// /// Creates a new instance of the class. /// @@ -225,7 +213,5 @@ public sealed class PathMatcher } // CLOVER:ON - - #endregion } //// diff --git a/src/Spring/Spring.Core/Util/PatternMatchUtils.cs b/src/Spring/Spring.Core/Util/PatternMatchUtils.cs index fffe74fb..d506430b 100644 --- a/src/Spring/Spring.Core/Util/PatternMatchUtils.cs +++ b/src/Spring/Spring.Core/Util/PatternMatchUtils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Util; /// Utility methods for simple pattern matching, in particular for diff --git a/src/Spring/Spring.Core/Util/Properties.cs b/src/Spring/Spring.Core/Util/Properties.cs index 8d5ff0f7..fc4b253f 100644 --- a/src/Spring/Spring.Core/Util/Properties.cs +++ b/src/Spring/Spring.Core/Util/Properties.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; namespace Spring.Util; @@ -47,17 +43,11 @@ namespace Spring.Util; [Serializable] public class Properties : Hashtable { - #region Constants - private const string Comments = "#!"; private const string Separators = ":="; private const string Whitespace = " \t\r\n"; private const string WhitespaceWithSeparators = Whitespace + Separators; - #endregion - - #region Constructor (s) / Destructor - /// /// Creates an empty property list with no default values. /// @@ -73,10 +63,6 @@ public class Properties : Hashtable { } - #endregion - - #region Methods - /// /// Reads a property list (key and element pairs) from the input stream. /// @@ -310,10 +296,6 @@ public class Properties : Hashtable } } - #endregion - - #region IDictionary Members - /// /// Adds the specified key / object pair to this collection. /// @@ -343,6 +325,4 @@ public class Properties : Hashtable { base.Add(key as string, value as string); } - - #endregion } diff --git a/src/Spring/Spring.Core/Util/ReflectionException.cs b/src/Spring/Spring.Core/Util/ReflectionException.cs index 54a18b5b..0f35d34c 100644 --- a/src/Spring/Spring.Core/Util/ReflectionException.cs +++ b/src/Spring/Spring.Core/Util/ReflectionException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Runtime.Serialization; -#endregion - namespace Spring.Util; /// @@ -34,8 +26,6 @@ namespace Spring.Util; [Serializable] public class ReflectionException : ApplicationException { - #region Constructor (s) / Destructor - /// Creates a new instance of the ObjectsException class. public ReflectionException() { @@ -82,6 +72,4 @@ public class ReflectionException : ApplicationException : base(info, context) { } - - #endregion } diff --git a/src/Spring/Spring.Core/Util/ReflectionUtils.cs b/src/Spring/Spring.Core/Util/ReflectionUtils.cs index f077dfdb..6f11ffc4 100644 --- a/src/Spring/Spring.Core/Util/ReflectionUtils.cs +++ b/src/Spring/Spring.Core/Util/ReflectionUtils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Globalization; using System.Reflection; @@ -753,13 +749,9 @@ public sealed class ReflectionUtils public static bool ParameterTypesMatch( MethodInfo candidate, Type[] parameterTypes) { - #region Sanity Checks - AssertUtils.ArgumentNotNull(candidate, "candidate"); AssertUtils.ArgumentNotNull(parameterTypes, "parameterTypes"); - #endregion - Type[] candidatesParameterTypes = ReflectionUtils.GetParameterTypes(candidate); if (candidatesParameterTypes.Length != parameterTypes.Length) @@ -932,8 +924,6 @@ public sealed class ReflectionUtils public static CustomAttributeBuilder CreateCustomAttribute( Type type, object[] ctorArgs, Attribute sourceAttribute) { - #region Sanity Checks - AssertUtils.ArgumentNotNull(type, "type"); if (!typeof(Attribute).IsAssignableFrom(type)) { @@ -942,8 +932,6 @@ public sealed class ReflectionUtils type.FullName)); } - #endregion - ConstructorInfo ci = type.GetConstructor(ReflectionUtils.GetTypes(ctorArgs)); if (ci == null && ctorArgs.Length == 0) { @@ -1662,8 +1650,6 @@ public sealed class ReflectionUtils return handler; } - #region Field Cache Management for "MemberwiseCopy" - private const BindingFlags FIELDBINDINGS = BindingFlags.Instance | BindingFlags.DeclaredOnly | BindingFlags.Public | BindingFlags.NonPublic; @@ -1696,27 +1682,17 @@ public sealed class ReflectionUtils CollectFieldsRecursive(type.BaseType, fieldList); } - #endregion Field Cache Management for "MemberwiseCopy" - - #region CustomAttributeBuilderBuilder inner class definition - /// /// Creates a . /// /// Bruno Baia public class CustomAttributeBuilderBuilder { - #region Fields - private Type type; private ArrayList constructorArgs; private List namedProperties; private List propertyValues; - #endregion - - #region Constructor(s) / Destructor - /// /// Creates a new instance of the /// class. @@ -1750,10 +1726,6 @@ public sealed class ReflectionUtils this.propertyValues = new List(); } - #endregion - - #region Public Methods - /// /// Adds the specified values to the constructor argument list /// used to create the custom attribute. @@ -1807,9 +1779,5 @@ public sealed class ReflectionUtils return new CustomAttributeBuilder(ci, caArray); } } - - #endregion } - - #endregion } diff --git a/src/Spring/Spring.Core/Util/SecurityCritical.cs b/src/Spring/Spring.Core/Util/SecurityCritical.cs index 14edb1be..b5444536 100644 --- a/src/Spring/Spring.Core/Util/SecurityCritical.cs +++ b/src/Spring/Spring.Core/Util/SecurityCritical.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - #if !NETSTANDARD using System.Runtime.CompilerServices; using System.Security; diff --git a/src/Spring/Spring.Core/Util/SystemUtils.cs b/src/Spring/Spring.Core/Util/SystemUtils.cs index 15fc1574..af005657 100644 --- a/src/Spring/Spring.Core/Util/SystemUtils.cs +++ b/src/Spring/Spring.Core/Util/SystemUtils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using System.Threading; -#endregion - namespace Spring.Util; /// diff --git a/src/Spring/Spring.Core/Util/TextPositionInfo.cs b/src/Spring/Spring.Core/Util/TextPositionInfo.cs index df2f8abe..41838ba5 100644 --- a/src/Spring/Spring.Core/Util/TextPositionInfo.cs +++ b/src/Spring/Spring.Core/Util/TextPositionInfo.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Util; /// diff --git a/src/Spring/Spring.Core/Util/UniqueKey.cs b/src/Spring/Spring.Core/Util/UniqueKey.cs index a91e0996..5f711999 100644 --- a/src/Spring/Spring.Core/Util/UniqueKey.cs +++ b/src/Spring/Spring.Core/Util/UniqueKey.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.ComponentModel; using System.Text; using Spring.Core.TypeConversion; -#endregion - namespace Spring.Util; /// diff --git a/src/Spring/Spring.Core/Util/XmlUtils.cs b/src/Spring/Spring.Core/Util/XmlUtils.cs index 8e9e372d..b8323775 100644 --- a/src/Spring/Spring.Core/Util/XmlUtils.cs +++ b/src/Spring/Spring.Core/Util/XmlUtils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Xml; using System.Xml.Schema; -#endregion - namespace Spring.Util; /// diff --git a/src/Spring/Spring.Core/Validation/Actions/ErrorMessageAction.cs b/src/Spring/Spring.Core/Validation/Actions/ErrorMessageAction.cs index 870aabbe..b04ec63d 100644 --- a/src/Spring/Spring.Core/Validation/Actions/ErrorMessageAction.cs +++ b/src/Spring/Spring.Core/Validation/Actions/ErrorMessageAction.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Spring.Expressions; using Spring.Util; diff --git a/src/Spring/Spring.Core/Validation/Actions/ExceptionAction.cs b/src/Spring/Spring.Core/Validation/Actions/ExceptionAction.cs index 204767c3..f73c0050 100644 --- a/src/Spring/Spring.Core/Validation/Actions/ExceptionAction.cs +++ b/src/Spring/Spring.Core/Validation/Actions/ExceptionAction.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using Spring.Expressions; diff --git a/src/Spring/Spring.Core/Validation/Actions/ExpressionAction.cs b/src/Spring/Spring.Core/Validation/Actions/ExpressionAction.cs index 9b06e998..24b934d5 100644 --- a/src/Spring/Spring.Core/Validation/Actions/ExpressionAction.cs +++ b/src/Spring/Spring.Core/Validation/Actions/ExpressionAction.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Expressions; namespace Spring.Validation.Actions; diff --git a/src/Spring/Spring.Core/Validation/AnyValidatorGroup.cs b/src/Spring/Spring.Core/Validation/AnyValidatorGroup.cs index 18eba113..8550f57e 100644 --- a/src/Spring/Spring.Core/Validation/AnyValidatorGroup.cs +++ b/src/Spring/Spring.Core/Validation/AnyValidatorGroup.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Expressions; namespace Spring.Validation; @@ -41,8 +37,6 @@ namespace Spring.Validation; /// Erich Eichinger public class AnyValidatorGroup : BaseValidatorGroup { - #region Constructors - /// /// Initializes a new instance of the class. /// @@ -71,8 +65,6 @@ public class AnyValidatorGroup : BaseValidatorGroup this.FastValidate = true; } - #endregion - /// /// Validates the specified object. /// diff --git a/src/Spring/Spring.Core/Validation/BaseSimpleValidator.cs b/src/Spring/Spring.Core/Validation/BaseSimpleValidator.cs index 10ab04d8..773af222 100644 --- a/src/Spring/Spring.Core/Validation/BaseSimpleValidator.cs +++ b/src/Spring/Spring.Core/Validation/BaseSimpleValidator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Expressions; namespace Spring.Validation; diff --git a/src/Spring/Spring.Core/Validation/BaseValidationAction.cs b/src/Spring/Spring.Core/Validation/BaseValidationAction.cs index 349837d6..91e0327d 100644 --- a/src/Spring/Spring.Core/Validation/BaseValidationAction.cs +++ b/src/Spring/Spring.Core/Validation/BaseValidationAction.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Expressions; namespace Spring.Validation; @@ -37,14 +33,8 @@ namespace Spring.Validation; /// Aleksandar Seovic public abstract class BaseValidationAction : IValidationAction { - #region Fields - private IExpression when; - #endregion - - #region Constructors - /// /// Initializes a new instance of the class. /// @@ -52,10 +42,6 @@ public abstract class BaseValidationAction : IValidationAction { } - #endregion - - #region Properties - /// /// Gets or sets the expression that determines if this validator should be evaluated. /// @@ -66,8 +52,6 @@ public abstract class BaseValidationAction : IValidationAction set { when = value; } } - #endregion - /// /// Executes the action. /// @@ -90,10 +74,6 @@ public abstract class BaseValidationAction : IValidationAction } } - #region Abstract methods - - // CLOVER:OFF - /// /// Called when associated validator is valid. /// @@ -114,12 +94,6 @@ public abstract class BaseValidationAction : IValidationAction { } - // CLOVER:ON - - #endregion - - #region Helper methods - /// /// Evaluates 'when' expression. /// @@ -135,6 +109,4 @@ public abstract class BaseValidationAction : IValidationAction return Convert.ToBoolean(When.GetValue(rootContext, contextParams)); } - - #endregion } diff --git a/src/Spring/Spring.Core/Validation/BaseValidator.cs b/src/Spring/Spring.Core/Validation/BaseValidator.cs index 6705b9cd..b2f75afb 100644 --- a/src/Spring/Spring.Core/Validation/BaseValidator.cs +++ b/src/Spring/Spring.Core/Validation/BaseValidator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Expressions; namespace Spring.Validation; @@ -36,16 +32,10 @@ namespace Spring.Validation; /// Erich Eichinger public abstract class BaseValidator : IValidator { - #region Fields - private IList actions = new List(); private IExpression when; - #endregion - - #region Constructors - /// /// Creates a new instance of the class. /// @@ -71,10 +61,6 @@ public abstract class BaseValidator : IValidator this.when = when; } - #endregion - - #region Properties - /// /// Gets or sets the expression that determines if this validator should be evaluated. /// @@ -95,8 +81,6 @@ public abstract class BaseValidator : IValidator set { actions = value; } } - #endregion - /// /// Validates the specified object. /// @@ -117,8 +101,6 @@ public abstract class BaseValidator : IValidator /// True if validation was successful, False otherwise. public abstract bool Validate(object validationContext, IDictionary contextParams, IValidationErrors errors); - #region Helper Methods - /// /// Evaluates when expression. /// @@ -152,6 +134,4 @@ public abstract class BaseValidator : IValidator } } } - - #endregion } diff --git a/src/Spring/Spring.Core/Validation/BaseValidatorGroup.cs b/src/Spring/Spring.Core/Validation/BaseValidatorGroup.cs index 04b445b8..0df3cc1d 100644 --- a/src/Spring/Spring.Core/Validation/BaseValidatorGroup.cs +++ b/src/Spring/Spring.Core/Validation/BaseValidatorGroup.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Spring.Expressions; diff --git a/src/Spring/Spring.Core/Validation/CollectionValidator.cs b/src/Spring/Spring.Core/Validation/CollectionValidator.cs index 5e2cf719..bfef131c 100644 --- a/src/Spring/Spring.Core/Validation/CollectionValidator.cs +++ b/src/Spring/Spring.Core/Validation/CollectionValidator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Spring.Expressions; @@ -47,15 +43,9 @@ namespace Spring.Validation; /// Aleksandar Seovic public class CollectionValidator : BaseValidatorGroup { - #region Fields - private bool includeElementErrors = false; private IExpression context; - #endregion - - #region Properties - /// /// Gets or sets the value that indicates whether to validate all elements of the collection /// regardless of the errors. @@ -87,10 +77,6 @@ public class CollectionValidator : BaseValidatorGroup set { context = value; } } - #endregion - - #region Constructors - /// /// Initializes a new instance of the class. /// @@ -143,8 +129,6 @@ public class CollectionValidator : BaseValidatorGroup this.includeElementErrors = includeElementErrors; } - #endregion - /// /// Validates the specified collection of objects. /// If the IncludeElementErrors property was set to true, diff --git a/src/Spring/Spring.Core/Validation/Config/ValidationNamespaceParser.cs b/src/Spring/Spring.Core/Validation/Config/ValidationNamespaceParser.cs index 4ab005b6..eb314c17 100644 --- a/src/Spring/Spring.Core/Validation/Config/ValidationNamespaceParser.cs +++ b/src/Spring/Spring.Core/Validation/Config/ValidationNamespaceParser.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Xml; using Spring.Core.TypeResolution; using Spring.Expressions; @@ -355,8 +351,6 @@ public sealed class ValidationNamespaceParser : ObjectsNamespaceParser return reference; } - #region Element & Attribute Name Constants - private class ValidatorDefinitionConstants { public const string PropertyElement = "property"; @@ -393,6 +387,4 @@ public sealed class ValidationNamespaceParser : ObjectsNamespaceParser public const string ProvidersAttribute = "providers"; public const string ParameterValueAttribute = "value"; } - - #endregion } diff --git a/src/Spring/Spring.Core/Validation/ErrorMessage.cs b/src/Spring/Spring.Core/Validation/ErrorMessage.cs index 353def3f..4bb04609 100644 --- a/src/Spring/Spring.Core/Validation/ErrorMessage.cs +++ b/src/Spring/Spring.Core/Validation/ErrorMessage.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Xml; using System.Xml.Schema; using System.Xml.Serialization; @@ -33,8 +29,6 @@ namespace Spring.Validation; [Serializable] public class ErrorMessage : IXmlSerializable { - #region Constructors - /// /// Default constructor. /// @@ -63,10 +57,6 @@ public class ErrorMessage : IXmlSerializable this.parameters = other.parameters; } - #endregion - - #region Properties - /// /// Gets or sets the resource identifier for this message. /// @@ -85,10 +75,6 @@ public class ErrorMessage : IXmlSerializable get { return parameters; } } - #endregion - - #region IXmlSerializable implementations - /// /// This property is reserved, apply the /// @@ -153,10 +139,6 @@ public class ErrorMessage : IXmlSerializable } } - #endregion - - #region ErrorMessage methods - /// /// Resolves the message against specified . /// @@ -179,8 +161,6 @@ public class ErrorMessage : IXmlSerializable } } - #endregion - /// ///Determines whether the specified is equal to the current . /// @@ -206,10 +186,6 @@ public class ErrorMessage : IXmlSerializable return id.GetHashCode(); } - #region Data members - private string id; private object[] parameters; - - #endregion } diff --git a/src/Spring/Spring.Core/Validation/ExclusiveValidatorGroup.cs b/src/Spring/Spring.Core/Validation/ExclusiveValidatorGroup.cs index 93bf9434..8dd29080 100644 --- a/src/Spring/Spring.Core/Validation/ExclusiveValidatorGroup.cs +++ b/src/Spring/Spring.Core/Validation/ExclusiveValidatorGroup.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Expressions; namespace Spring.Validation; @@ -42,8 +38,6 @@ namespace Spring.Validation; /// Erich Eichinger public class ExclusiveValidatorGroup : BaseValidatorGroup { - #region Constructors - /// /// Initializes a new instance of the class. /// @@ -72,8 +66,6 @@ public class ExclusiveValidatorGroup : BaseValidatorGroup this.FastValidate = true; } - #endregion - /// /// Actual implementation how to validate the specified object. /// diff --git a/src/Spring/Spring.Core/Validation/IValidationAction.cs b/src/Spring/Spring.Core/Validation/IValidationAction.cs index 004e55d9..ff6bf0a5 100644 --- a/src/Spring/Spring.Core/Validation/IValidationAction.cs +++ b/src/Spring/Spring.Core/Validation/IValidationAction.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Validation.Actions; namespace Spring.Validation; diff --git a/src/Spring/Spring.Core/Validation/IValidator.cs b/src/Spring/Spring.Core/Validation/IValidator.cs index 85e04d4a..6722abb9 100644 --- a/src/Spring/Spring.Core/Validation/IValidator.cs +++ b/src/Spring/Spring.Core/Validation/IValidator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Validation; /// diff --git a/src/Spring/Spring.Core/Validation/ValidationErrors.cs b/src/Spring/Spring.Core/Validation/ValidationErrors.cs index 48258297..3bbb93ec 100644 --- a/src/Spring/Spring.Core/Validation/ValidationErrors.cs +++ b/src/Spring/Spring.Core/Validation/ValidationErrors.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Xml; using System.Xml.Schema; using System.Xml.Serialization; @@ -41,8 +37,6 @@ namespace Spring.Validation; [Serializable] public class ValidationErrors : IValidationErrors, IXmlSerializable { - #region Constructors - /// /// Default constructor. /// @@ -50,10 +44,6 @@ public class ValidationErrors : IValidationErrors, IXmlSerializable { } - #endregion - - #region IXmlSerializable implementations - /// /// This property is reserved, apply the /// @@ -137,10 +127,6 @@ public class ValidationErrors : IValidationErrors, IXmlSerializable } } - #endregion - - #region ValidationErrors methods - /// /// Does this instance contain any validation errors? /// @@ -287,11 +273,5 @@ public class ValidationErrors : IValidationErrors, IXmlSerializable return messages; } - #endregion - - #region Data members - private readonly IDictionary> errorMap = new Dictionary>(); - - #endregion } diff --git a/src/Spring/Spring.Core/Validation/ValidationException.cs b/src/Spring/Spring.Core/Validation/ValidationException.cs index 08492643..67ca4f08 100644 --- a/src/Spring/Spring.Core/Validation/ValidationException.cs +++ b/src/Spring/Spring.Core/Validation/ValidationException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Validation; diff --git a/src/Spring/Spring.Core/Validation/ValidatorGroup.cs b/src/Spring/Spring.Core/Validation/ValidatorGroup.cs index 985621be..fd710de0 100644 --- a/src/Spring/Spring.Core/Validation/ValidatorGroup.cs +++ b/src/Spring/Spring.Core/Validation/ValidatorGroup.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Expressions; namespace Spring.Validation; @@ -39,8 +35,6 @@ namespace Spring.Validation; /// Erich Eichinger public class ValidatorGroup : BaseValidatorGroup { - #region Constructors - /// /// Initializes a new instance /// @@ -64,8 +58,6 @@ public class ValidatorGroup : BaseValidatorGroup { } - #endregion - /// /// Actual implementation how to validate the specified object. /// diff --git a/src/Spring/Spring.Core/Validation/ValidatorReference.cs b/src/Spring/Spring.Core/Validation/ValidatorReference.cs index 6f43437c..4a6e37ac 100644 --- a/src/Spring/Spring.Core/Validation/ValidatorReference.cs +++ b/src/Spring/Spring.Core/Validation/ValidatorReference.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Expressions; using Spring.Objects.Factory; @@ -39,8 +35,6 @@ namespace Spring.Validation; /// Aleksandar Seovic public class ValidatorReference : IValidator, IObjectFactoryAware { - #region Fields - private IObjectFactory objectFactory; private string name; @@ -48,10 +42,6 @@ public class ValidatorReference : IValidator, IObjectFactoryAware private IExpression when; private IValidator validator; - #endregion - - #region Constructors - /// /// Creates a new instance of the class. /// @@ -81,10 +71,6 @@ public class ValidatorReference : IValidator, IObjectFactoryAware this.when = when; } - #endregion - - #region Properties - /// /// Gets or sets the name of the referenced validator. /// @@ -115,8 +101,6 @@ public class ValidatorReference : IValidator, IObjectFactoryAware set { when = value; } } - #endregion - /// /// Validates the specified object. /// diff --git a/src/Spring/Spring.Core/Validation/Validators/ConditionValidator.cs b/src/Spring/Spring.Core/Validation/Validators/ConditionValidator.cs index aedc7c47..4b6c4fbe 100644 --- a/src/Spring/Spring.Core/Validation/Validators/ConditionValidator.cs +++ b/src/Spring/Spring.Core/Validation/Validators/ConditionValidator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Expressions; using Spring.Util; @@ -29,8 +25,6 @@ namespace Spring.Validation; /// Aleksandar Seovic public class ConditionValidator : BaseSimpleValidator { - #region Constructors - /// /// Creates a new instance of the class. /// @@ -58,8 +52,6 @@ public class ConditionValidator : BaseSimpleValidator AssertUtils.ArgumentNotNull(test, "test"); } - #endregion - /// /// Evaluates the test using condition evaluator. /// diff --git a/src/Spring/Spring.Core/Validation/Validators/CreditCardValidator.cs b/src/Spring/Spring.Core/Validation/Validators/CreditCardValidator.cs index f5babff4..68421725 100644 --- a/src/Spring/Spring.Core/Validation/Validators/CreditCardValidator.cs +++ b/src/Spring/Spring.Core/Validation/Validators/CreditCardValidator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Expressions; using Spring.Util; @@ -34,8 +30,6 @@ namespace Spring.Validation.Validators; /// public class CreditCardValidator : BaseSimpleValidator { - #region Properties - /// /// Credit card type validator to use. /// @@ -51,10 +45,6 @@ public class CreditCardValidator : BaseSimpleValidator set { m_cardType = value; } } - #endregion - - #region Constructors - /// /// Creates a new instance of the UrlValidator class. /// @@ -88,10 +78,6 @@ public class CreditCardValidator : BaseSimpleValidator this.m_cardType = cardType; } - #endregion - - #region BaseValidator methods - /// /// Validates the supplied . /// @@ -117,10 +103,6 @@ public class CreditCardValidator : BaseSimpleValidator return IsValid(text); } - #endregion - - #region CreditCardValidator methods - /// /// Checks if the is a valid credit card number. /// @@ -219,17 +201,9 @@ public class CreditCardValidator : BaseSimpleValidator return (sum == 0) ? false : (sum % 10 == 0); } - #endregion - - #region Data members - private ICreditCardType m_cardType; - - #endregion } -#region CreditCardType classes - /// /// CreditCardType interface defines how validation is performed /// for one type/brand of credit card. @@ -313,6 +287,4 @@ public class Mastercard : ICreditCardType String prefix2 = card.Substring(0, 2) + ","; return ((PREFIX.IndexOf(prefix2) != -1) && (card.Length == 16)); } -} - -#endregion +} \ No newline at end of file diff --git a/src/Spring/Spring.Core/Validation/Validators/EmailValidator.cs b/src/Spring/Spring.Core/Validation/Validators/EmailValidator.cs index 551d4858..b0a01966 100644 --- a/src/Spring/Spring.Core/Validation/Validators/EmailValidator.cs +++ b/src/Spring/Spring.Core/Validation/Validators/EmailValidator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Text.RegularExpressions; using Spring.Expressions; using Spring.Util; @@ -36,8 +32,6 @@ namespace Spring.Validation.Validators; /// Goran Milosavljevic public class EmailValidator : BaseSimpleValidator { - #region Constructors - /// /// Creates a new instance of the EmailValidator class. /// @@ -67,10 +61,6 @@ public class EmailValidator : BaseSimpleValidator AssertUtils.ArgumentNotNull(test, "test"); } - #endregion - - #region BaseValidator methods - /// /// Validates the supplied . /// @@ -97,14 +87,8 @@ public class EmailValidator : BaseSimpleValidator return match.Success && match.Index == 0 && match.Length == text.Length; } - #endregion - - #region Data members - /// /// Regular expression used for validation of object passed to this . /// private static string emailCheck = @"^([\w-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([\w-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$"; - - #endregion } diff --git a/src/Spring/Spring.Core/Validation/Validators/ISBNValidator.cs b/src/Spring/Spring.Core/Validation/Validators/ISBNValidator.cs index 7ddb506e..dea4fb32 100644 --- a/src/Spring/Spring.Core/Validation/Validators/ISBNValidator.cs +++ b/src/Spring/Spring.Core/Validation/Validators/ISBNValidator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Text.RegularExpressions; using Spring.Expressions; using Spring.Util; @@ -30,8 +26,6 @@ namespace Spring.Validation.Validators; /// Goran Milosavljevic public class ISBNValidator : BaseSimpleValidator { - #region Constructors - /// /// Creates a new instance of the ISBNValidator class. /// @@ -61,10 +55,6 @@ public class ISBNValidator : BaseSimpleValidator AssertUtils.ArgumentNotNull(test, "test"); } - #endregion - - #region BaseValidator methods - /// /// Validates the supplied . /// @@ -89,10 +79,6 @@ public class ISBNValidator : BaseSimpleValidator return IsValid(isbn); } - #endregion - - #region ISBNValidator methods - /// /// Validates against ISBN-10 or ISBN-13 validation /// rules. @@ -129,10 +115,6 @@ public class ISBNValidator : BaseSimpleValidator return match.Success && match.Index == 0 && match.Length == code.Length; } - #endregion - - #region Data members - private static readonly String SEP = "(?:\\-|\\s)"; private static readonly String GROUP = "(\\d{1,5})"; private static readonly String PUBLISHER = "(\\d{1,7})"; @@ -157,6 +139,4 @@ public class ISBNValidator : BaseSimpleValidator /// 1-5 characters, third 1-7, fourth 1-6, and fifth is 1 digit. /// static readonly String ISBN13_PATTERN = "^(978|979)(?:(\\d{10})|(?:" + SEP + GROUP + SEP + PUBLISHER + SEP + TITLE + SEP + "([0-9])))$"; - - #endregion } diff --git a/src/Spring/Spring.Core/Validation/Validators/RegularExpressionValidator.cs b/src/Spring/Spring.Core/Validation/Validators/RegularExpressionValidator.cs index 04a0b980..18188e9b 100644 --- a/src/Spring/Spring.Core/Validation/Validators/RegularExpressionValidator.cs +++ b/src/Spring/Spring.Core/Validation/Validators/RegularExpressionValidator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -36,8 +30,6 @@ * limitations under the License. */ -#endregion - using System.Text.RegularExpressions; using Spring.Expressions; using Spring.Util; @@ -56,16 +48,10 @@ namespace Spring.Validation; /// Aleksandar Seovic public class RegularExpressionValidator : BaseSimpleValidator { - #region Fields - private string expression = string.Empty; private bool allowPartialMatching = false; private RegexOptions options; - #endregion - - #region Constructors - /// /// Creates a new instance of the class. /// @@ -99,10 +85,6 @@ public class RegularExpressionValidator : BaseSimpleValidator this.expression = expression; } - #endregion - - #region Properties - /// /// The regular expression text to match against. /// @@ -134,8 +116,6 @@ public class RegularExpressionValidator : BaseSimpleValidator set { options = value; } } - #endregion - /// /// Validates an object. /// diff --git a/src/Spring/Spring.Core/Validation/Validators/RequiredValidator.cs b/src/Spring/Spring.Core/Validation/Validators/RequiredValidator.cs index 57956c28..dc5ebb59 100644 --- a/src/Spring/Spring.Core/Validation/Validators/RequiredValidator.cs +++ b/src/Spring/Spring.Core/Validation/Validators/RequiredValidator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Expressions; using Spring.Util; @@ -64,8 +60,6 @@ namespace Spring.Validation; /// Aleksandar Seovic public class RequiredValidator : BaseSimpleValidator { - #region Constructors - /// /// Creates a new instance of the class. /// @@ -93,8 +87,6 @@ public class RequiredValidator : BaseSimpleValidator AssertUtils.ArgumentNotNull(test, "test"); } - #endregion - /// /// Validates the supplied . /// diff --git a/src/Spring/Spring.Core/Validation/Validators/UrlValidator.cs b/src/Spring/Spring.Core/Validation/Validators/UrlValidator.cs index 2e09ad06..d1a5dcfe 100644 --- a/src/Spring/Spring.Core/Validation/Validators/UrlValidator.cs +++ b/src/Spring/Spring.Core/Validation/Validators/UrlValidator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Text.RegularExpressions; using Spring.Expressions; using Spring.Util; @@ -30,8 +26,6 @@ namespace Spring.Validation.Validators; /// Goran Milosavljevic public class UrlValidator : BaseSimpleValidator { - #region Constructors - /// /// Creates a new instance of the UrlValidator class. /// @@ -61,10 +55,6 @@ public class UrlValidator : BaseSimpleValidator AssertUtils.ArgumentNotNull(test, "test"); } - #endregion - - #region BaseValidator methods - /// /// Validates the supplied . /// @@ -89,14 +79,8 @@ public class UrlValidator : BaseSimpleValidator return match.Success && match.Index == 0 && match.Length == text.Length; } - #endregion - - #region Data members - /// /// Regular expression used for validation of object passed to this . /// private static string urlCheck = "((http|https)://)?[a-z0-9]+([-.]{1}[a-z0-9]+)*.[a-z]{2,5}(([0-9]{1,5})?/.*)?"; - - #endregion } diff --git a/src/Spring/Spring.Data.NHibernate5/Data/NHibernate/Support/OpenSessionInViewModule.cs b/src/Spring/Spring.Data.NHibernate5/Data/NHibernate/Support/OpenSessionInViewModule.cs index 937b1f8d..b376c183 100644 --- a/src/Spring/Spring.Data.NHibernate5/Data/NHibernate/Support/OpenSessionInViewModule.cs +++ b/src/Spring/Spring.Data.NHibernate5/Data/NHibernate/Support/OpenSessionInViewModule.cs @@ -1,5 +1,3 @@ -#region Licence - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Web; namespace Spring.Data.NHibernate.Support; diff --git a/src/Spring/Spring.Data/Dao/Attributes/PersistenceExceptionTranslationAdvisor.cs b/src/Spring/Spring.Data/Dao/Attributes/PersistenceExceptionTranslationAdvisor.cs index b472319b..9d08f343 100644 --- a/src/Spring/Spring.Data/Dao/Attributes/PersistenceExceptionTranslationAdvisor.cs +++ b/src/Spring/Spring.Data/Dao/Attributes/PersistenceExceptionTranslationAdvisor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using AopAlliance.Aop; using Spring.Aop; using Spring.Aop.Support; diff --git a/src/Spring/Spring.Data/Dao/Attributes/PersistenceExceptionTranslationPostProcessor.cs b/src/Spring/Spring.Data/Dao/Attributes/PersistenceExceptionTranslationPostProcessor.cs index 78e07648..efa52e2f 100644 --- a/src/Spring/Spring.Data/Dao/Attributes/PersistenceExceptionTranslationPostProcessor.cs +++ b/src/Spring/Spring.Data/Dao/Attributes/PersistenceExceptionTranslationPostProcessor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Aop.Framework; using Spring.Core; using Spring.Dao.Support; diff --git a/src/Spring/Spring.Data/Dao/CannotAcquireLockException.cs b/src/Spring/Spring.Data/Dao/CannotAcquireLockException.cs index 04bdc6a0..b411646e 100644 --- a/src/Spring/Spring.Data/Dao/CannotAcquireLockException.cs +++ b/src/Spring/Spring.Data/Dao/CannotAcquireLockException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Dao; diff --git a/src/Spring/Spring.Data/Dao/CannotSerializeTransactionException.cs b/src/Spring/Spring.Data/Dao/CannotSerializeTransactionException.cs index 89160433..46e15e34 100644 --- a/src/Spring/Spring.Data/Dao/CannotSerializeTransactionException.cs +++ b/src/Spring/Spring.Data/Dao/CannotSerializeTransactionException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Dao; diff --git a/src/Spring/Spring.Data/Dao/CleanupFailureDataAccessException.cs b/src/Spring/Spring.Data/Dao/CleanupFailureDataAccessException.cs index 64faf557..5953461c 100644 --- a/src/Spring/Spring.Data/Dao/CleanupFailureDataAccessException.cs +++ b/src/Spring/Spring.Data/Dao/CleanupFailureDataAccessException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Dao; diff --git a/src/Spring/Spring.Data/Dao/ConcurrencyFailureException.cs b/src/Spring/Spring.Data/Dao/ConcurrencyFailureException.cs index f4f004c5..a06f39ae 100644 --- a/src/Spring/Spring.Data/Dao/ConcurrencyFailureException.cs +++ b/src/Spring/Spring.Data/Dao/ConcurrencyFailureException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Dao; diff --git a/src/Spring/Spring.Data/Dao/DataAccessException.cs b/src/Spring/Spring.Data/Dao/DataAccessException.cs index 0196fe30..68d63513 100644 --- a/src/Spring/Spring.Data/Dao/DataAccessException.cs +++ b/src/Spring/Spring.Data/Dao/DataAccessException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Dao; diff --git a/src/Spring/Spring.Data/Dao/DataAccessResourceFailureException.cs b/src/Spring/Spring.Data/Dao/DataAccessResourceFailureException.cs index 567f1ed7..4d5689ea 100644 --- a/src/Spring/Spring.Data/Dao/DataAccessResourceFailureException.cs +++ b/src/Spring/Spring.Data/Dao/DataAccessResourceFailureException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Dao; diff --git a/src/Spring/Spring.Data/Dao/DataIntegrityViolationException.cs b/src/Spring/Spring.Data/Dao/DataIntegrityViolationException.cs index fe1bcf6d..3a0de42a 100644 --- a/src/Spring/Spring.Data/Dao/DataIntegrityViolationException.cs +++ b/src/Spring/Spring.Data/Dao/DataIntegrityViolationException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Dao; diff --git a/src/Spring/Spring.Data/Dao/DataRetrievalFailureException.cs b/src/Spring/Spring.Data/Dao/DataRetrievalFailureException.cs index 687437e3..3e78fed1 100644 --- a/src/Spring/Spring.Data/Dao/DataRetrievalFailureException.cs +++ b/src/Spring/Spring.Data/Dao/DataRetrievalFailureException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Dao; diff --git a/src/Spring/Spring.Data/Dao/DeadlockLoserDataAccessException.cs b/src/Spring/Spring.Data/Dao/DeadlockLoserDataAccessException.cs index 085d8d25..8e9a52cc 100644 --- a/src/Spring/Spring.Data/Dao/DeadlockLoserDataAccessException.cs +++ b/src/Spring/Spring.Data/Dao/DeadlockLoserDataAccessException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Dao; diff --git a/src/Spring/Spring.Data/Dao/EmptyResultDataAccessException.cs b/src/Spring/Spring.Data/Dao/EmptyResultDataAccessException.cs index 314fff7e..2b3cd8ee 100644 --- a/src/Spring/Spring.Data/Dao/EmptyResultDataAccessException.cs +++ b/src/Spring/Spring.Data/Dao/EmptyResultDataAccessException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Dao; diff --git a/src/Spring/Spring.Data/Dao/IncorrectResultSizeDataAccessException.cs b/src/Spring/Spring.Data/Dao/IncorrectResultSizeDataAccessException.cs index 195d41f8..027c39a4 100644 --- a/src/Spring/Spring.Data/Dao/IncorrectResultSizeDataAccessException.cs +++ b/src/Spring/Spring.Data/Dao/IncorrectResultSizeDataAccessException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Dao; diff --git a/src/Spring/Spring.Data/Dao/IncorrectUpdateSemanticsDataAccessException.cs b/src/Spring/Spring.Data/Dao/IncorrectUpdateSemanticsDataAccessException.cs index 10f22819..67c5b993 100644 --- a/src/Spring/Spring.Data/Dao/IncorrectUpdateSemanticsDataAccessException.cs +++ b/src/Spring/Spring.Data/Dao/IncorrectUpdateSemanticsDataAccessException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Dao; diff --git a/src/Spring/Spring.Data/Dao/InvalidDataAccessApiUsageException.cs b/src/Spring/Spring.Data/Dao/InvalidDataAccessApiUsageException.cs index 0698530c..64e93de5 100644 --- a/src/Spring/Spring.Data/Dao/InvalidDataAccessApiUsageException.cs +++ b/src/Spring/Spring.Data/Dao/InvalidDataAccessApiUsageException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Dao; diff --git a/src/Spring/Spring.Data/Dao/InvalidDataAccessResourceUsageException.cs b/src/Spring/Spring.Data/Dao/InvalidDataAccessResourceUsageException.cs index 57490ef2..ee4aa831 100644 --- a/src/Spring/Spring.Data/Dao/InvalidDataAccessResourceUsageException.cs +++ b/src/Spring/Spring.Data/Dao/InvalidDataAccessResourceUsageException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Dao; diff --git a/src/Spring/Spring.Data/Dao/NonTransientDataAccessException.cs b/src/Spring/Spring.Data/Dao/NonTransientDataAccessException.cs index 11014b2a..d6a8aa1f 100644 --- a/src/Spring/Spring.Data/Dao/NonTransientDataAccessException.cs +++ b/src/Spring/Spring.Data/Dao/NonTransientDataAccessException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Dao; diff --git a/src/Spring/Spring.Data/Dao/NonTransientDataAccessResourceException.cs b/src/Spring/Spring.Data/Dao/NonTransientDataAccessResourceException.cs index 10abc274..770a6a65 100644 --- a/src/Spring/Spring.Data/Dao/NonTransientDataAccessResourceException.cs +++ b/src/Spring/Spring.Data/Dao/NonTransientDataAccessResourceException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Dao; diff --git a/src/Spring/Spring.Data/Dao/ObjectOptimisticLockingFailureException.cs b/src/Spring/Spring.Data/Dao/ObjectOptimisticLockingFailureException.cs index 0c745ad0..03b24b0f 100644 --- a/src/Spring/Spring.Data/Dao/ObjectOptimisticLockingFailureException.cs +++ b/src/Spring/Spring.Data/Dao/ObjectOptimisticLockingFailureException.cs @@ -1,5 +1,3 @@ -#region Licence - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Dao; @@ -30,16 +26,10 @@ namespace Spring.Dao; [Serializable] public class ObjectOptimisticLockingFailureException : OptimisticLockingFailureException, ISerializable { - #region Fields - private object persistentClass; private object identifier; - #endregion - - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -100,8 +90,6 @@ public class ObjectOptimisticLockingFailureException : OptimisticLockingFailureE { } - #endregion - public Type PersistentClass { get { return persistentClass as Type; } @@ -125,16 +113,6 @@ public class ObjectOptimisticLockingFailureException : OptimisticLockingFailureE } } - #region Properties - - #endregion - - #region Methods - - #endregion - - #region ISerializable Members - /// /// When overridden in a derived class, sets the /// with information about the exception. @@ -148,6 +126,4 @@ public class ObjectOptimisticLockingFailureException : OptimisticLockingFailureE info.AddValue("identifier", identifier); base.GetObjectData(info, context); } - - #endregion } \ No newline at end of file diff --git a/src/Spring/Spring.Data/Dao/ObjectRetrievalFailureException.cs b/src/Spring/Spring.Data/Dao/ObjectRetrievalFailureException.cs index 2d248514..80eb8326 100644 --- a/src/Spring/Spring.Data/Dao/ObjectRetrievalFailureException.cs +++ b/src/Spring/Spring.Data/Dao/ObjectRetrievalFailureException.cs @@ -1,5 +1,3 @@ -#region Licence - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Dao; @@ -34,8 +30,6 @@ public class ObjectRetrievalFailureException : DataRetrievalFailureException private object identifier; - #region Constructor (s) - /// /// Creates a new instance of the /// class. @@ -94,8 +88,6 @@ public class ObjectRetrievalFailureException : DataRetrievalFailureException { } - #endregion - public object PersistentClass { get { return persistentClass; } diff --git a/src/Spring/Spring.Data/Dao/OptimisticLockingFailureException.cs b/src/Spring/Spring.Data/Dao/OptimisticLockingFailureException.cs index 354a5498..158c4842 100644 --- a/src/Spring/Spring.Data/Dao/OptimisticLockingFailureException.cs +++ b/src/Spring/Spring.Data/Dao/OptimisticLockingFailureException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Dao; diff --git a/src/Spring/Spring.Data/Dao/PermissionDeniedDataAccessException.cs b/src/Spring/Spring.Data/Dao/PermissionDeniedDataAccessException.cs index 30f8d84d..36c88ea1 100644 --- a/src/Spring/Spring.Data/Dao/PermissionDeniedDataAccessException.cs +++ b/src/Spring/Spring.Data/Dao/PermissionDeniedDataAccessException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Dao; diff --git a/src/Spring/Spring.Data/Dao/PessimisticLockingFailureException.cs b/src/Spring/Spring.Data/Dao/PessimisticLockingFailureException.cs index d93e15b0..b8631b57 100644 --- a/src/Spring/Spring.Data/Dao/PessimisticLockingFailureException.cs +++ b/src/Spring/Spring.Data/Dao/PessimisticLockingFailureException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Dao; diff --git a/src/Spring/Spring.Data/Dao/Support/ChainedPersistenceExceptionTranslator.cs b/src/Spring/Spring.Data/Dao/Support/ChainedPersistenceExceptionTranslator.cs index 09bcb3be..fb80b31f 100644 --- a/src/Spring/Spring.Data/Dao/Support/ChainedPersistenceExceptionTranslator.cs +++ b/src/Spring/Spring.Data/Dao/Support/ChainedPersistenceExceptionTranslator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Spring.Data.Support; using Spring.Util; diff --git a/src/Spring/Spring.Data/Dao/Support/DaoSupport.cs b/src/Spring/Spring.Data/Dao/Support/DaoSupport.cs index 7e0625e6..541dd9dd 100644 --- a/src/Spring/Spring.Data/Dao/Support/DaoSupport.cs +++ b/src/Spring/Spring.Data/Dao/Support/DaoSupport.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using Spring.Objects.Factory; @@ -33,21 +29,11 @@ namespace Spring.Dao.Support; /// Mark Pollack (.NET) public abstract class DaoSupport : IInitializingObject { - #region Fields - - #endregion - - #region Constants - /// /// The shared instance for this class (and derived classes). /// protected static readonly ILogger log = LogManager.GetLogger(typeof(DaoSupport)); - #endregion - - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -55,14 +41,6 @@ public abstract class DaoSupport : IInitializingObject { } - #endregion - - #region Properties - - #endregion - - #region Methods - /// /// Abstract subclasses must override this to check their configuration. /// @@ -85,8 +63,6 @@ public abstract class DaoSupport : IInitializingObject { } - #endregion - public void AfterPropertiesSet() { // Let abstract subclasses check their configuration. diff --git a/src/Spring/Spring.Data/Dao/Support/DataAccessUtils.cs b/src/Spring/Spring.Data/Dao/Support/DataAccessUtils.cs index 56fcc00e..323d4d0b 100644 --- a/src/Spring/Spring.Data/Dao/Support/DataAccessUtils.cs +++ b/src/Spring/Spring.Data/Dao/Support/DataAccessUtils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Spring.Util; @@ -30,8 +26,6 @@ namespace Spring.Dao.Support; /// Mark Pollack (.NET) public class DataAccessUtils { - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -39,10 +33,6 @@ public class DataAccessUtils { } - #endregion - - #region Methods - public static object RequiredUniqueResultSet(IList results) { int size = (results != null ? results.Count : 0); @@ -74,6 +64,4 @@ public class DataAccessUtils AssertUtils.ArgumentNotNull(pet, "PersistenceExceptionTranslator must not be null"); return pet.TranslateExceptionIfPossible(rawException); } - - #endregion } diff --git a/src/Spring/Spring.Data/Dao/Support/Generic/DataAccessUtils.cs b/src/Spring/Spring.Data/Dao/Support/Generic/DataAccessUtils.cs index 524997c4..228cbc00 100644 --- a/src/Spring/Spring.Data/Dao/Support/Generic/DataAccessUtils.cs +++ b/src/Spring/Spring.Data/Dao/Support/Generic/DataAccessUtils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Util.Generic; namespace Spring.Dao.Support.Generic; @@ -29,8 +25,6 @@ namespace Spring.Dao.Support.Generic; /// Mark Pollack (.NET) public class DataAccessUtils { - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -38,10 +32,6 @@ public class DataAccessUtils { } - #endregion - - #region Methods - public static T RequiredUniqueResultSet(IList results) { int size = (results != null ? results.Count : 0); @@ -59,6 +49,4 @@ public class DataAccessUtils enumerator.MoveNext(); return enumerator.Current; } - - #endregion } diff --git a/src/Spring/Spring.Data/Dao/Support/IPersistenceExceptionTranslator.cs b/src/Spring/Spring.Data/Dao/Support/IPersistenceExceptionTranslator.cs index d2442e79..035f1b9f 100644 --- a/src/Spring/Spring.Data/Dao/Support/IPersistenceExceptionTranslator.cs +++ b/src/Spring/Spring.Data/Dao/Support/IPersistenceExceptionTranslator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Data.Support; namespace Spring.Dao.Support; diff --git a/src/Spring/Spring.Data/Dao/Support/PersistenceExceptionTranslationInterceptor.cs b/src/Spring/Spring.Data/Dao/Support/PersistenceExceptionTranslationInterceptor.cs index a9e37b53..9fe7d1de 100644 --- a/src/Spring/Spring.Data/Dao/Support/PersistenceExceptionTranslationInterceptor.cs +++ b/src/Spring/Spring.Data/Dao/Support/PersistenceExceptionTranslationInterceptor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using AopAlliance.Intercept; using Spring.Objects.Factory; using Spring.Util; diff --git a/src/Spring/Spring.Data/Dao/TransientDataAccessException.cs b/src/Spring/Spring.Data/Dao/TransientDataAccessException.cs index dac1e16f..132c8c40 100644 --- a/src/Spring/Spring.Data/Dao/TransientDataAccessException.cs +++ b/src/Spring/Spring.Data/Dao/TransientDataAccessException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Dao; diff --git a/src/Spring/Spring.Data/Dao/TransientDataAccessResourceException.cs b/src/Spring/Spring.Data/Dao/TransientDataAccessResourceException.cs index 55658f65..e2c2b9d9 100644 --- a/src/Spring/Spring.Data/Dao/TransientDataAccessResourceException.cs +++ b/src/Spring/Spring.Data/Dao/TransientDataAccessResourceException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Dao; diff --git a/src/Spring/Spring.Data/Dao/TypeMismatchDataAccessException.cs b/src/Spring/Spring.Data/Dao/TypeMismatchDataAccessException.cs index 990b8486..46127ccf 100644 --- a/src/Spring/Spring.Data/Dao/TypeMismatchDataAccessException.cs +++ b/src/Spring/Spring.Data/Dao/TypeMismatchDataAccessException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Dao; diff --git a/src/Spring/Spring.Data/Dao/UncategorizedDataAccessException.cs b/src/Spring/Spring.Data/Dao/UncategorizedDataAccessException.cs index d434302e..77b0ee5d 100644 --- a/src/Spring/Spring.Data/Dao/UncategorizedDataAccessException.cs +++ b/src/Spring/Spring.Data/Dao/UncategorizedDataAccessException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Dao; diff --git a/src/Spring/Spring.Data/Data/BadSqlGrammarException.cs b/src/Spring/Spring.Data/Data/BadSqlGrammarException.cs index 2d66f167..1c308047 100644 --- a/src/Spring/Spring.Data/Data/BadSqlGrammarException.cs +++ b/src/Spring/Spring.Data/Data/BadSqlGrammarException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using Spring.Dao; @@ -30,17 +26,11 @@ namespace Spring.Data; [Serializable] public class BadSqlGrammarException : InvalidDataAccessResourceUsageException, ISerializable { - #region Fields - /// /// SQL that led to the problem /// private string sql; - #endregion - - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -79,10 +69,6 @@ public class BadSqlGrammarException : InvalidDataAccessResourceUsageException, I /// protected BadSqlGrammarException(SerializationInfo info, StreamingContext context) : base(info, context) { } - #endregion - - #region Properties - public string Sql { get @@ -91,10 +77,6 @@ public class BadSqlGrammarException : InvalidDataAccessResourceUsageException, I } } - #endregion - - #region ISerializable Members - /// /// When overridden in a derived class, sets the /// with information about the exception. @@ -107,6 +89,4 @@ public class BadSqlGrammarException : InvalidDataAccessResourceUsageException, I info.AddValue("sql", sql); base.GetObjectData(info, context); } - - #endregion } diff --git a/src/Spring/Spring.Data/Data/CannotGetAdoConnectionException.cs b/src/Spring/Spring.Data/Data/CannotGetAdoConnectionException.cs index 08ceb1d0..2353a641 100644 --- a/src/Spring/Spring.Data/Data/CannotGetAdoConnectionException.cs +++ b/src/Spring/Spring.Data/Data/CannotGetAdoConnectionException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using Spring.Dao; @@ -31,8 +27,6 @@ namespace Spring.Data; [Serializable] public class CannotGetAdoConnectionException : InvalidDataAccessResourceUsageException { - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -60,6 +54,4 @@ public class CannotGetAdoConnectionException : InvalidDataAccessResourceUsageExc /// protected CannotGetAdoConnectionException(SerializationInfo info, StreamingContext context) : base(info, context) { } - - #endregion } diff --git a/src/Spring/Spring.Data/Data/CommandDelegate.cs b/src/Spring/Spring.Data/Data/CommandDelegate.cs index 37b51a97..aa3baea0 100644 --- a/src/Spring/Spring.Data/Data/CommandDelegate.cs +++ b/src/Spring/Spring.Data/Data/CommandDelegate.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; namespace Spring.Data; diff --git a/src/Spring/Spring.Data/Data/CommandSetterDelegate.cs b/src/Spring/Spring.Data/Data/CommandSetterDelegate.cs index 86706515..dce75878 100644 --- a/src/Spring/Spring.Data/Data/CommandSetterDelegate.cs +++ b/src/Spring/Spring.Data/Data/CommandSetterDelegate.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; namespace Spring.Data; diff --git a/src/Spring/Spring.Data/Data/Common/DbMetadata.cs b/src/Spring/Spring.Data/Data/Common/DbMetadata.cs index 12c2cc53..0aec8770 100644 --- a/src/Spring/Spring.Data/Data/Common/DbMetadata.cs +++ b/src/Spring/Spring.Data/Data/Common/DbMetadata.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using Spring.Util; @@ -29,8 +25,6 @@ namespace Spring.Data.Common; /// Mark Pollack (.NET) public class DbMetadata : IDbMetadata { - #region Fields - private bool supportsDeriveParametersMethod = true; private string productName; @@ -57,10 +51,6 @@ public class DbMetadata : IDbMetadata private ErrorCodes errorCodes; - #endregion - - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -177,10 +167,6 @@ public class DbMetadata : IDbMetadata return "DbProvider product name = " + productName; } - #endregion - - #region IDbMetadata Members - /// /// Gets a value indicating whether to use param name prefix in parameter collection. /// @@ -395,6 +381,4 @@ public class DbMetadata : IDbMetadata { get { return errorCodeExceptionExpression; } } - - #endregion } diff --git a/src/Spring/Spring.Data/Data/Common/DbParameter.cs b/src/Spring/Spring.Data/Data/Common/DbParameter.cs index c9211245..9720fc3c 100644 --- a/src/Spring/Spring.Data/Data/Common/DbParameter.cs +++ b/src/Spring/Spring.Data/Data/Common/DbParameter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; namespace Spring.Data.Common; @@ -28,8 +24,6 @@ namespace Spring.Data.Common; /// Mark Pollack (.NET) public class DbParameter : Spring.Data.Common.IDbParameter { - #region Fields - private Enum dbType; private ParameterDirection direction; private bool isNullable; @@ -41,10 +35,6 @@ public class DbParameter : Spring.Data.Common.IDbParameter private byte scale; private int size; - #endregion - - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -57,10 +47,6 @@ public class DbParameter : Spring.Data.Common.IDbParameter direction = ParameterDirection.Input; } - #endregion - - #region IDbParameter Members - public Enum DbType { set @@ -69,8 +55,6 @@ public class DbParameter : Spring.Data.Common.IDbParameter } } - #endregion - public IDbParameter Type(Enum dbType) { this.dbType = dbType; diff --git a/src/Spring/Spring.Data/Data/Common/DbParameters.cs b/src/Spring/Spring.Data/Data/Common/DbParameters.cs index 180efe42..c7e012e8 100644 --- a/src/Spring/Spring.Data/Data/Common/DbParameters.cs +++ b/src/Spring/Spring.Data/Data/Common/DbParameters.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; using System.Reflection; using Spring.Dao; @@ -31,18 +27,12 @@ namespace Spring.Data.Common; /// Mark Pollack (.NET) public class DbParameters : IDbParameters { - #region Fields - private IDbProvider dbProvider; //Just used as a container for the underlying parameter collection. private IDbCommand dbCommand; private IDataParameterCollection dataParameterCollection; - #endregion - - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -53,16 +43,6 @@ public class DbParameters : IDbParameters dataParameterCollection = dbCommand.Parameters; } - #endregion - - #region Properties - - #endregion - - #region Methods - - #endregion - public IDataParameter this[string parameterName] { get { return (IDbDataParameter) dataParameterCollection[parameterName]; } diff --git a/src/Spring/Spring.Data/Data/Common/DbParametersBuilder.cs b/src/Spring/Spring.Data/Data/Common/DbParametersBuilder.cs index 97668979..3304a2c0 100644 --- a/src/Spring/Spring.Data/Data/Common/DbParametersBuilder.cs +++ b/src/Spring/Spring.Data/Data/Common/DbParametersBuilder.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; namespace Spring.Data.Common; @@ -32,15 +28,9 @@ namespace Spring.Data.Common; /// Mark Pollack (.NET) public class DbParametersBuilder : IDbParametersBuilder { - #region Fields - private IDbProvider dbProvider; private IList parameterList; - #endregion - - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -50,10 +40,6 @@ public class DbParametersBuilder : IDbParametersBuilder parameterList = new ArrayList(); } - #endregion - - #region Methods - public IDbParameter Create() { IDbParameter p = new DbParameter(); @@ -85,6 +71,4 @@ public class DbParametersBuilder : IDbParametersBuilder { return new DbParameters(dbProvider); } - - #endregion } diff --git a/src/Spring/Spring.Data/Data/Common/DbProvider.cs b/src/Spring/Spring.Data/Data/Common/DbProvider.cs index 233bb1cd..a59446f8 100644 --- a/src/Spring/Spring.Data/Data/Common/DbProvider.cs +++ b/src/Spring/Spring.Data/Data/Common/DbProvider.cs @@ -1,5 +1,3 @@ -#region Licence - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; using Spring.Expressions; using Spring.Reflection.Dynamic; diff --git a/src/Spring/Spring.Data/Data/Common/DbProviderConfigurer.cs b/src/Spring/Spring.Data/Data/Common/DbProviderConfigurer.cs index 2d4a3c98..e5d152fd 100644 --- a/src/Spring/Spring.Data/Data/Common/DbProviderConfigurer.cs +++ b/src/Spring/Spring.Data/Data/Common/DbProviderConfigurer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using Spring.Core; using Spring.Core.IO; @@ -31,18 +27,12 @@ namespace Spring.Data.Common; /// Mark Pollack public class DbProviderConfigurer : IObjectFactoryPostProcessor, IOrdered { - #region Fields - private static readonly ILogger log = LogManager.GetLogger(); private int order = Int32.MinValue; private IResource providerResource; - #endregion - - #region Constructor - /// /// Initializes a new instance of the class. /// @@ -50,10 +40,6 @@ public class DbProviderConfigurer : IObjectFactoryPostProcessor, IOrdered { } - #endregion - - #region Properties - /// /// Gets or sets the provider resource which contains additional IDbProvider definitions. /// @@ -64,10 +50,6 @@ public class DbProviderConfigurer : IObjectFactoryPostProcessor, IOrdered set { providerResource = value; } } - #endregion - - #region Implementation of IObjectFactoryPostProcessor - /// /// Modify the application context's internal object factory after its /// standard initialization. @@ -88,14 +70,8 @@ public class DbProviderConfigurer : IObjectFactoryPostProcessor, IOrdered DbProviderFactory.DBPROVIDER_ADDITIONAL_RESOURCE_NAME = providerResource.Uri.AbsoluteUri; } - #endregion - - #region Implementation of IOrdered - public int Order { get { return order; } } - - #endregion } diff --git a/src/Spring/Spring.Data/Data/Common/DbProviderFactoryObject.cs b/src/Spring/Spring.Data/Data/Common/DbProviderFactoryObject.cs index 64ea3e09..2cf3106f 100644 --- a/src/Spring/Spring.Data/Data/Common/DbProviderFactoryObject.cs +++ b/src/Spring/Spring.Data/Data/Common/DbProviderFactoryObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects.Factory; using Spring.Util; @@ -33,16 +29,10 @@ namespace Spring.Data.Common; /// public class DbProviderFactoryObject : IFactoryObject, IInitializingObject { - #region Fields - private string provider; private string connectionString; private IDbProvider dbProvider; - #endregion - - #region Constructor - /// /// Creates a new instance of the class. /// @@ -50,10 +40,6 @@ public class DbProviderFactoryObject : IFactoryObject, IInitializingObject { } - #endregion - - #region Properties - /// /// Gets or sets the name of the database provider. /// @@ -82,10 +68,6 @@ public class DbProviderFactoryObject : IFactoryObject, IInitializingObject } } - #endregion - - #region IFactoryObject Members - /// /// Return an instance of and IDbProvider as configured by this factory /// managed by this factory. @@ -148,10 +130,6 @@ public class DbProviderFactoryObject : IFactoryObject, IInitializingObject get { return true; } } - #endregion - - #region IInitializingObject Memebers - /// /// Validates that the provider name is specified. /// @@ -167,10 +145,6 @@ public class DbProviderFactoryObject : IFactoryObject, IInitializingObject ValidateProperties(); } - #endregion - - #region Private Memebers - /// /// Validates the properties. /// @@ -181,6 +155,4 @@ public class DbProviderFactoryObject : IFactoryObject, IInitializingObject throw new ArgumentException("The 'DbProviderName' property has not been set."); } } - - #endregion } diff --git a/src/Spring/Spring.Data/Data/Common/DelegatingDbProvider.cs b/src/Spring/Spring.Data/Data/Common/DelegatingDbProvider.cs index f3689082..c5fdaa57 100644 --- a/src/Spring/Spring.Data/Data/Common/DelegatingDbProvider.cs +++ b/src/Spring/Spring.Data/Data/Common/DelegatingDbProvider.cs @@ -1,5 +1,3 @@ -#region Licence - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; using Spring.Objects.Factory; using Spring.Util; @@ -63,8 +59,6 @@ public class DelegatingDbProvider : IDbProvider, IInitializingObject } } - #region IDbProvider Members - /// /// Returns a new command object for executing SQL statments/Stored Procedures /// against the database. @@ -180,10 +174,6 @@ public class DelegatingDbProvider : IDbProvider, IInitializingObject return TargetDbProvider.IsDataAccessException(e); } - #endregion - - #region IInitializingObject Members - /// /// Invoked by an /// after it has injected all of an object's dependencies. @@ -217,6 +207,4 @@ public class DelegatingDbProvider : IDbProvider, IInitializingObject throw new ArgumentNullException("Property 'TargetDbProvider' is required."); } } - - #endregion } diff --git a/src/Spring/Spring.Data/Data/Common/ErrorCodes.cs b/src/Spring/Spring.Data/Data/Common/ErrorCodes.cs index 23cfa7a3..29130208 100644 --- a/src/Spring/Spring.Data/Data/Common/ErrorCodes.cs +++ b/src/Spring/Spring.Data/Data/Common/ErrorCodes.cs @@ -1,5 +1,3 @@ -#region Licence - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Data.Common; /// @@ -31,8 +27,6 @@ namespace Spring.Data.Common; /// Mark Pollack (.NET) public class ErrorCodes { - #region Fields - private string[] databaseProductNames; private string[] badSqlGrammarCodes = new String[0]; @@ -57,10 +51,6 @@ public class ErrorCodes // CustomErrorCodesTranslation[] customTranslations; - #endregion - - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -68,10 +58,6 @@ public class ErrorCodes { } - #endregion - - #region Properties - public string DatabaseProductName { get @@ -145,6 +131,4 @@ public class ErrorCodes get { return duplicateKeyCodes; } set { duplicateKeyCodes = value; } } - - #endregion } diff --git a/src/Spring/Spring.Data/Data/Common/IDbMetadata.cs b/src/Spring/Spring.Data/Data/Common/IDbMetadata.cs index 7254f338..14fdfedf 100644 --- a/src/Spring/Spring.Data/Data/Common/IDbMetadata.cs +++ b/src/Spring/Spring.Data/Data/Common/IDbMetadata.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; namespace Spring.Data.Common; diff --git a/src/Spring/Spring.Data/Data/Common/IDbParameter.cs b/src/Spring/Spring.Data/Data/Common/IDbParameter.cs index e30f9306..35aaae1e 100644 --- a/src/Spring/Spring.Data/Data/Common/IDbParameter.cs +++ b/src/Spring/Spring.Data/Data/Common/IDbParameter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; namespace Spring.Data.Common; diff --git a/src/Spring/Spring.Data/Data/Common/IDbProvider.cs b/src/Spring/Spring.Data/Data/Common/IDbProvider.cs index bcdef397..edf4bdb2 100644 --- a/src/Spring/Spring.Data/Data/Common/IDbProvider.cs +++ b/src/Spring/Spring.Data/Data/Common/IDbProvider.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; namespace Spring.Data.Common; diff --git a/src/Spring/Spring.Data/Data/Common/MultiDelegatingDbProvider.cs b/src/Spring/Spring.Data/Data/Common/MultiDelegatingDbProvider.cs index 04adf140..613c04ea 100644 --- a/src/Spring/Spring.Data/Data/Common/MultiDelegatingDbProvider.cs +++ b/src/Spring/Spring.Data/Data/Common/MultiDelegatingDbProvider.cs @@ -1,5 +1,3 @@ -#region Licence - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Data; using Microsoft.Extensions.Logging; @@ -47,14 +43,8 @@ public class MultiDelegatingDbProvider : IDbProvider, IInitializingObject private IDictionary targetDbProviders = new SynchronizedHashtable(); - #region Logging Definition - private static readonly ILogger LOG = LogManager.GetLogger(); - #endregion - - #region Constructors - /// /// Initializes a new instance of the class. /// @@ -71,8 +61,6 @@ public class MultiDelegatingDbProvider : IDbProvider, IInitializingObject this.targetDbProviders = targetDbProviders; } - #endregion - /// /// Sets the default IDbProvider. This will be returned if no DbProvider is found in thread local storage. /// @@ -118,8 +106,6 @@ public class MultiDelegatingDbProvider : IDbProvider, IInitializingObject } } - #region IDbProvider methods - /// /// Returns a new command object for executing SQL statments/Stored Procedures /// against the database. @@ -260,8 +246,6 @@ public class MultiDelegatingDbProvider : IDbProvider, IInitializingObject return false; } - #endregion - /// /// Gets the target provider based on the thread local name "dbProviderName" /// diff --git a/src/Spring/Spring.Data/Data/Common/UserCredentialsDbProvider.cs b/src/Spring/Spring.Data/Data/Common/UserCredentialsDbProvider.cs index 8487658b..0276881b 100644 --- a/src/Spring/Spring.Data/Data/Common/UserCredentialsDbProvider.cs +++ b/src/Spring/Spring.Data/Data/Common/UserCredentialsDbProvider.cs @@ -1,5 +1,3 @@ -#region Licence - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; using Spring.Threading; using Spring.Util; diff --git a/src/Spring/Spring.Data/Data/Config/DatabaseNamespaceParser.cs b/src/Spring/Spring.Data/Data/Config/DatabaseNamespaceParser.cs index a234dc9f..d42c4df8 100644 --- a/src/Spring/Spring.Data/Data/Config/DatabaseNamespaceParser.cs +++ b/src/Spring/Spring.Data/Data/Config/DatabaseNamespaceParser.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Xml; using Spring.Data.Common; using Spring.Core.TypeResolution; diff --git a/src/Spring/Spring.Data/Data/Core/AdoAccessor.cs b/src/Spring/Spring.Data/Data/Core/AdoAccessor.cs index 32188917..be626bcc 100644 --- a/src/Spring/Spring.Data/Data/Core/AdoAccessor.cs +++ b/src/Spring/Spring.Data/Data/Core/AdoAccessor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; using Spring.Data.Common; using Spring.Data.Support; @@ -37,8 +33,6 @@ public abstract class AdoAccessor : IInitializingObject private int commandTimeout = -1; - #region Properties - /// /// An instance of a DbProvider implementation. /// @@ -100,8 +94,6 @@ public abstract class AdoAccessor : IInitializingObject set { commandTimeout = value; } } - #endregion - /// /// Prepare the command setting the transaction timeout. /// @@ -209,8 +201,6 @@ public abstract class AdoAccessor : IInitializingObject return parameters; } - #region Parameter Creation Helper Methods - /// /// Creates a new instance of /// @@ -237,6 +227,4 @@ public abstract class AdoAccessor : IInitializingObject /// if set to true to include return parameter. /// The stored procedure parameters public abstract IDataParameter[] DeriveParameters(string procedureName, bool includeReturnParameter); - - #endregion } diff --git a/src/Spring/Spring.Data/Data/Core/AdoDaoSupport.cs b/src/Spring/Spring.Data/Data/Core/AdoDaoSupport.cs index 516f583c..0c5c07c5 100644 --- a/src/Spring/Spring.Data/Data/Core/AdoDaoSupport.cs +++ b/src/Spring/Spring.Data/Data/Core/AdoDaoSupport.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; using Spring.Dao.Support; using Spring.Data.Common; diff --git a/src/Spring/Spring.Data/Data/Core/AdoPlatformTransactionManager.cs b/src/Spring/Spring.Data/Data/Core/AdoPlatformTransactionManager.cs index 762f5185..301c7fc4 100644 --- a/src/Spring/Spring.Data/Data/Core/AdoPlatformTransactionManager.cs +++ b/src/Spring/Spring.Data/Data/Core/AdoPlatformTransactionManager.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; using Microsoft.Extensions.Logging; using Spring.Data.Common; @@ -37,12 +33,8 @@ public class AdoPlatformTransactionManager : AbstractPlatformTransactionManager, { private IDbProvider dbProvider; - #region Logging Definition - private static readonly ILogger LOG = LogManager.GetLogger(typeof(AdoPlatformTransactionManager)); - #endregion - public AdoPlatformTransactionManager() { NestedTransactionsAllowed = true; @@ -53,16 +45,12 @@ public class AdoPlatformTransactionManager : AbstractPlatformTransactionManager, DbProvider = dbProvider; } - #region Propeties - public IDbProvider DbProvider { get { return dbProvider; } set { dbProvider = value; } } - #endregion - /// /// Return the current transaction object. /// diff --git a/src/Spring/Spring.Data/Data/Core/AdoTemplate.cs b/src/Spring/Spring.Data/Data/Core/AdoTemplate.cs index cba6f990..25bde679 100644 --- a/src/Spring/Spring.Data/Data/Core/AdoTemplate.cs +++ b/src/Spring/Spring.Data/Data/Core/AdoTemplate.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Data; using System.Data.Common; @@ -39,14 +35,8 @@ namespace Spring.Data.Core; /// Mark Pollack (.NET) public class AdoTemplate : AdoAccessor, IAdoOperations { - #region Logging Definition - private static readonly ILogger LOG = LogManager.GetLogger(); - #endregion - - #region Fields - private IDbProvider dbProvider; private IAdoExceptionTranslator exceptionTranslator; @@ -55,10 +45,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations private Type dataReaderWrapperType; protected IDynamicConstructor newDataReaderWrapper; - #endregion - - #region Constructors - /// /// Initializes a new instance of the class. /// @@ -90,10 +76,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations AfterPropertiesSet(); } - #endregion - - #region Properties - /// /// An instance of a DbProvider implementation. /// @@ -171,8 +153,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations } } - #endregion - public override void AfterPropertiesSet() { if (DbProvider == null) @@ -186,8 +166,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations } } - #region General Execute Callback Methods - /// /// Execute a ADO.NET operation on a command object using a delegate callback. /// @@ -340,10 +318,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations } } - #endregion - - #region ExecuteNonQuery - /// /// Executes a non query returning the number of rows affected. /// @@ -352,15 +326,11 @@ public class AdoTemplate : AdoAccessor, IAdoOperations /// The number of rows affected. public virtual int ExecuteNonQuery(CommandType cmdType, string cmdText) { - #region Instrumentation - if (LOG.IsEnabled(LogLevel.Debug)) { LOG.LogDebug("Executing NonQuery " + cmdType + "[" + cmdText + "]"); } - #endregion - return (int) Execute(new ExecuteNonQueryCallbackWithParameters(cmdType, cmdText, null)); } @@ -391,15 +361,11 @@ public class AdoTemplate : AdoAccessor, IAdoOperations public virtual int ExecuteNonQuery(CommandType cmdType, string cmdText, IDbParameters parameters) { - #region Instrumentation - if (LOG.IsEnabled(LogLevel.Debug)) { LOG.LogDebug("Executing NonQuery. " + cmdType + "[" + cmdText + "]"); } - #endregion - return (int) Execute(new ExecuteNonQueryCallbackWithParameters(cmdType, cmdText, parameters)); } @@ -414,15 +380,11 @@ public class AdoTemplate : AdoAccessor, IAdoOperations public virtual int ExecuteNonQuery(CommandType cmdType, string cmdText, ICommandSetter commandSetter) { - #region Instrumentation - if (LOG.IsEnabled(LogLevel.Debug)) { LOG.LogDebug("Executing NonQuery. " + cmdType + "[" + cmdText + "]"); } - #endregion - return (int) Execute(new ExecuteNonQueryCallbackWithCommandSetter(cmdType, cmdText, commandSetter)); } @@ -444,10 +406,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations return (IDictionary) Execute(commandCreator, new AdoNonQueryWithOutputParamsCommandCallback()); } - #endregion - - #region ExecuteScalar - /// /// Execute the query with the specified command text. /// @@ -503,15 +461,11 @@ public class AdoTemplate : AdoAccessor, IAdoOperations public virtual object ExecuteScalar(CommandType cmdType, string cmdText, ICommandSetter commandSetter) { - #region Instrumentation - if (LOG.IsEnabled(LogLevel.Debug)) { LOG.LogDebug("Executing ExecuteScalar. " + cmdType + "[" + cmdText + "]"); } - #endregion - return Execute(new ExecuteScalarCallbackWithCommandSetter(cmdType, cmdText, commandSetter)); } @@ -532,10 +486,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations return (IDictionary) Execute(commandCreator, new AdoStoredProcedureScalarCommandCallback()); } - #endregion - - #region Query with RowCallback - /// /// Execute a query given IDbCommand's type and text, reading a /// single result set on a per-row basis with a . @@ -593,13 +543,9 @@ public class AdoTemplate : AdoAccessor, IAdoOperations QueryWithResultSetExtractor(cmdType, cmdText, new RowCallbackResultSetExtractor(rowCallback), parameters); } - #endregion - // RowCallback with Delegate Questionable for 1.1 since no anonymous delegates and there isn't a collecting parameter // in the delegate method signature. - #region Query with RowCallback Delegate - public virtual void QueryWithRowCallbackDelegate(CommandType cmdType, string sql, RowCallbackDelegate rowCallbackDelegate) { QueryWithResultSetExtractor(cmdType, sql, new RowCallbackResultSetExtractor(rowCallbackDelegate)); @@ -621,10 +567,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations QueryWithResultSetExtractor(cmdType, sql, new RowCallbackResultSetExtractor(rowCallbackDelegate), parameters); } - #endregion - - #region Query with RowMapper - public virtual IList QueryWithRowMapper(CommandType cmdType, string cmdText, IRowMapper rowMapper) { return (IList) QueryWithResultSetExtractor(cmdType, cmdText, new RowMapperResultSetExtractor(rowMapper)); @@ -647,10 +589,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations return (IList) QueryWithResultSetExtractor(cmdType, cmdText, new RowMapperResultSetExtractor(rowMapper), parameters); } - #endregion - - #region Query With RowMapper Delegate - public virtual IList QueryWithRowMapperDelegate(CommandType cmdType, string cmdText, RowMapperDelegate rowMapperDelegate) { return (IList) QueryWithResultSetExtractor(cmdType, cmdText, new RowMapperResultSetExtractor(rowMapperDelegate)); @@ -673,10 +611,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations return (IList) QueryWithResultSetExtractor(cmdType, cmdText, new RowMapperResultSetExtractor(rowMapperDelegate), parameters); } - #endregion - - #region Query with ResultSetExtractor - /// /// Execute a query given static SQL/Stored Procedure name /// and process a single result set with an instance of IResultSetExtractor @@ -720,10 +654,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations return Execute(new QueryCallback(this, cmdType, cmdText, resultSetExtractor, parameters)); } - #endregion - - #region Query with ResultSetExtractorDelegate - /// /// Execute a query given static SQL/Stored Procedure name /// and process a single result set with an instance of IResultSetExtractor @@ -768,10 +698,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations return Execute(new QueryCallback(this, cmdType, cmdText, resultSetExtractorDelegate, parameters)); } - #endregion - - #region Query for Object - /// /// Execute a query with the specified command text, mapping a single result /// row to an object via a RowMapper. @@ -859,10 +785,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations return DataAccessUtils.RequiredUniqueResultSet(results); } - #endregion - - #region Query for ObjectDelegate - /// /// Execute a query with the specified command text, mapping a single result /// row to an object via a RowMapper. @@ -950,10 +872,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations return DataAccessUtils.RequiredUniqueResultSet(results); } - #endregion - - #region Query with CommandCreator - public virtual object QueryWithCommandCreator(IDbCommandCreator cc, IResultSetExtractor rse) { return QueryWithCommandCreator(cc, rse, null); @@ -1004,12 +922,8 @@ public class AdoTemplate : AdoAccessor, IAdoOperations return (IDictionary) Execute(cc, new AdoResultProcessorsQueryCommandCallback(this, namedResultSetProcessors)); } - #endregion - // DataSet/DataTable related methods. - #region DataTable Create operations without parameters - public virtual DataTable DataTableCreate(CommandType commandType, string sql) { DataTable dataTable = CreateDataTable(); @@ -1042,10 +956,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations return dataTable; } - #endregion - - #region DataTable Create operations with parameters - public virtual DataTable DataTableCreateWithParams(CommandType commandType, string sql, IDbParameters parameters) { @@ -1082,10 +992,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations return dataTable; } - #endregion - - #region DataTable Fill operations without parameters - /// /// Fill a based on a select command that requires no parameters. /// @@ -1097,15 +1003,11 @@ public class AdoTemplate : AdoAccessor, IAdoOperations { ValidateFillArguments(dataTable, sql); - #region Instrumentation - if (LOG.IsEnabled(LogLevel.Debug)) { LOG.LogDebug("Executing DataTableFill " + commandType + "[" + sql + "]"); } - #endregion - ITableMappingCollection mappingCollection = DoCreateMappingCollection(null); return (int) Execute(new DataAdapterFillCallback(dataTable, commandType, sql, @@ -1117,15 +1019,11 @@ public class AdoTemplate : AdoAccessor, IAdoOperations { ValidateFillArguments(dataTable, sql); - #region Instrumentation - if (LOG.IsEnabled(LogLevel.Debug)) { LOG.LogDebug("Executing DataTableFill " + commandType + "[" + sql + "] with table mapping name " + tableMappingName); } - #endregion - if (tableMappingName == null) { tableMappingName = "Table"; @@ -1161,10 +1059,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations mappingCollection, setter, null, null)); } - #endregion - - #region DataTable Fill operations with parameters - public virtual int DataTableFillWithParams(DataTable dataTable, CommandType commandType, string sql, IDbParameters parameters) { @@ -1217,10 +1111,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations mappingCollection, dataAdapterSetter, null, parameters)); } - #endregion - - #region DataTable Update operations - //TODO conflict options... public virtual int DataTableUpdateWithCommandBuilder(DataTable dataTable, @@ -1327,10 +1217,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations dataAdapterSetter); } - #endregion - - #region DataSet Create operations without parameters - public virtual DataSet DataSetCreate(CommandType commandType, string sql) { DataSet dataSet = CreateDataSet(); @@ -1373,10 +1259,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations return dataSet; } - #endregion - - #region DataSet Create operations with parameters - public virtual DataSet DataSetCreateWithParams(CommandType commandType, string sql, IDbParameters parameters) { @@ -1424,23 +1306,15 @@ public class AdoTemplate : AdoAccessor, IAdoOperations return dataSet; } - #endregion - - #region DataSet Fill operations without parameters - public virtual int DataSetFill(DataSet dataSet, CommandType commandType, string sql) { ValidateFillArguments(dataSet, sql); - #region Instrumentation - if (LOG.IsEnabled(LogLevel.Debug)) { LOG.LogDebug("Executing DataSetFill " + commandType + "[" + sql + "]"); } - #endregion - ITableMappingCollection mappingCollection = DoCreateMappingCollection(null); return (int) Execute(new DataAdapterFillCallback(dataSet, commandType, sql, @@ -1451,15 +1325,11 @@ public class AdoTemplate : AdoAccessor, IAdoOperations { ValidateFillArguments(dataSet, sql); - #region Instrumentation - if (LOG.IsEnabled(LogLevel.Debug)) { LOG.LogDebug("Executing DataSetFill " + commandType + "[" + sql + "] with table names " + tableNames); } - #endregion - if (tableNames == null) { tableNames = new string[] { "Table" }; @@ -1501,10 +1371,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations tableMapping, setter, fillLifecycleProcessor, null)); } - #endregion - - #region DataSet Fill operations with parameters - public virtual int DataSetFillWithParameters(DataSet dataSet, CommandType commandType, string sql, IDbParameters parameters) { @@ -1565,10 +1431,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations tableMapping, dataAdapterSetter, fillLifecycleProcessor, parameters)); } - #endregion - - #region DataSet Update operations - public virtual int DataSetUpdateWithCommandBuilder(DataSet dataSet, CommandType commandType, string selectSql, @@ -1744,19 +1606,11 @@ public class AdoTemplate : AdoAccessor, IAdoOperations dataAdapterSetter)); } - #endregion - - #region Parameter Creation Helper Methods - public override IDataParameter[] DeriveParameters(string procedureName, bool includeReturnParameter) { return (IDataParameter[]) Execute(new DeriveParametersCommandCallback(DbProvider, procedureName, includeReturnParameter)); } - #endregion - - #region Private Helper Methods - private IDbParameters CreateDbParameters(IDbDataParameter parameter) { IDbParameters parameters = new DbParameters(DbProvider); @@ -1850,10 +1704,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations return returnVal; } - #endregion - - #region Protected Helper Methods - protected virtual void InitExceptionTranslator() { if (exceptionTranslator == null) @@ -1870,10 +1720,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations } } - #endregion - - #region Protected DataAdapter Helper methods - protected virtual DataTable CreateDataTable() { DataTable dataTable = new DataTable(); @@ -2133,10 +1979,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations return mappingCollection; } - #endregion - - #region Private DataAdapter Helper callbacks - private class DataAdapterFillCallback : IDataAdapterCallback { private bool containsDataSet; @@ -2282,8 +2124,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations this.dataAdapterSetter = dataAdapterSetter; } - #region IDataAdapterCallback Members - public object DoInDataAdapter(IDbDataAdapter dataAdapter) { //TODO - did not make copies of parameters... @@ -2344,8 +2184,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations dbCommand.Connection = sourceCommand.Connection; dbCommand.Transaction = sourceCommand.Transaction; } - - #endregion } private class DataAdapterUpdateWithCommandBuilderCallback : IDataAdapterCallback @@ -2396,8 +2234,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations this.dataAdapterSetter = dataAdapterSetter; } - #region IDataAdapterCallback Members - public object DoInDataAdapter(IDbDataAdapter dataAdapter) { dataAdapter.SelectCommand.CommandType = selectCommandType; @@ -2449,14 +2285,8 @@ public class AdoTemplate : AdoAccessor, IAdoOperations dbCommand.Connection = sourceCommand.Connection; dbCommand.Transaction = sourceCommand.Transaction; } - - #endregion } - #endregion - - #region Private Helper Classes - private class AdoStoredProcedureScalarCommandCallback : ICommandCallback { public object DoInCommand(IDbCommand command) @@ -3011,8 +2841,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations } } - #endregion - /// /// Creates the data reader wrapper for use in AdoTemplate callback methods. /// diff --git a/src/Spring/Spring.Data/Data/Core/ServiceDomainPlatformTransactionManager.cs b/src/Spring/Spring.Data/Data/Core/ServiceDomainPlatformTransactionManager.cs index 7bb167cf..a1367bb9 100644 --- a/src/Spring/Spring.Data/Data/Core/ServiceDomainPlatformTransactionManager.cs +++ b/src/Spring/Spring.Data/Data/Core/ServiceDomainPlatformTransactionManager.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.EnterpriseServices; using Microsoft.Extensions.Logging; using Spring.Data.Support; @@ -41,8 +37,6 @@ public class ServiceDomainPlatformTransactionManager : AbstractPlatformTransacti private string trackingAppName = "Spring.NET"; private string trackingComponentName = "ServiceDomainPlatformTransactionManager"; - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -61,8 +55,6 @@ public class ServiceDomainPlatformTransactionManager : AbstractPlatformTransacti this.txAdapter = txAdapter; } - #endregion - /// /// Gets or sets a value indicating whether tracking is enabled. /// diff --git a/src/Spring/Spring.Data/Data/DuplicateKeyException.cs b/src/Spring/Spring.Data/Data/DuplicateKeyException.cs index 44661e91..f7640a9f 100644 --- a/src/Spring/Spring.Data/Data/DuplicateKeyException.cs +++ b/src/Spring/Spring.Data/Data/DuplicateKeyException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using Spring.Dao; @@ -34,17 +30,11 @@ namespace Spring.Data; [Serializable] public class DuplicateKeyException : DataIntegrityViolationException { - #region Fields - /// /// SQL that led to the problem /// private string sql; - #endregion - - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -83,10 +73,6 @@ public class DuplicateKeyException : DataIntegrityViolationException /// protected DuplicateKeyException(SerializationInfo info, StreamingContext context) : base(info, context) { } - #endregion - - #region Properties - /// /// Gets the SQL that caused the exception /// @@ -99,14 +85,6 @@ public class DuplicateKeyException : DataIntegrityViolationException } } - #endregion - - #region Methods - - #endregion - - #region ISerializable Members - /// /// When overridden in a derived class, sets the /// with information about the exception. @@ -119,6 +97,4 @@ public class DuplicateKeyException : DataIntegrityViolationException info.AddValue("sql", sql); base.GetObjectData(info, context); } - - #endregion } diff --git a/src/Spring/Spring.Data/Data/Generic/AdoDaoSupport.cs b/src/Spring/Spring.Data/Data/Generic/AdoDaoSupport.cs index 07cda015..2f01bf81 100644 --- a/src/Spring/Spring.Data/Data/Generic/AdoDaoSupport.cs +++ b/src/Spring/Spring.Data/Data/Generic/AdoDaoSupport.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; using Spring.Dao.Support; using Spring.Data.Common; diff --git a/src/Spring/Spring.Data/Data/Generic/AdoTemplate.cs b/src/Spring/Spring.Data/Data/Generic/AdoTemplate.cs index 571ea1fc..7271d041 100644 --- a/src/Spring/Spring.Data/Data/Generic/AdoTemplate.cs +++ b/src/Spring/Spring.Data/Data/Generic/AdoTemplate.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Data; using System.Data.Common; @@ -38,20 +34,10 @@ namespace Spring.Data.Generic; /// Mark Pollack (.NET) public class AdoTemplate : AdoAccessor, IAdoOperations { - #region Logging Definition - private static readonly ILogger LOG = LogManager.GetLogger(); - #endregion - - #region Fields - private Core.AdoTemplate classicAdoTemplate; - #endregion - - #region Constructors - /// /// Initializes a new instance of the class. /// @@ -94,10 +80,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations AfterPropertiesSet(); } - #endregion - - #region Properties - /// /// An instance of a DbProvider implementation. /// @@ -176,10 +158,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations } } - #endregion - - #region General Execute Callback methods - /// /// Execute a ADO.NET operation on a command object using a interface based callback. /// @@ -521,10 +499,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations } } - #endregion - - #region ExecuteNonQuery - /// /// Executes a non query returning the number of rows affected. /// @@ -597,10 +571,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations return classicAdoTemplate.ExecuteNonQuery(commandCreator); } - #endregion - - #region ExecuteScalar - /// /// Execute the query with the specified command text. /// @@ -675,10 +645,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations return classicAdoTemplate.ExecuteScalar(commandCreator); } - #endregion - - #region Queries with RowCallback - /// /// Execute a query given IDbCommand's type and text by /// passing the created IDbCommand to a ICommandSetter implementation @@ -748,10 +714,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations parameter); } - #endregion - - #region Queries with RowCallback Delegate - public virtual void QueryWithRowCallbackDelegate(CommandType cmdType, string sql, RowCallbackDelegate rowCallbackDelegate) { classicAdoTemplate.QueryWithRowCallbackDelegate(cmdType, sql, rowCallbackDelegate); @@ -774,10 +736,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations classicAdoTemplate.QueryWithRowCallbackDelegate(cmdType, sql, rowCallbackDelegate, parameters); } - #endregion - - #region Queries with RowMapper - public virtual IList QueryWithRowMapper(CommandType cmdType, string cmdText, IRowMapper rowMapper) { return QueryWithResultSetExtractor(cmdType, cmdText, new RowMapperResultSetExtractor(rowMapper)); @@ -800,10 +758,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations return QueryWithResultSetExtractor(cmdType, cmdText, new RowMapperResultSetExtractor(rowMapper), parameters); } - #endregion - - #region Queries with RowMapperDelegate - public virtual IList QueryWithRowMapperDelegate(CommandType cmdType, string cmdText, RowMapperDelegate rowMapperDelegate) { return QueryWithResultSetExtractor(cmdType, cmdText, new RowMapperResultSetExtractor(rowMapperDelegate)); @@ -830,10 +784,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations parameters); } - #endregion - - #region Queries with ResultSetExtractor - public virtual T QueryWithResultSetExtractor(CommandType cmdType, string cmdText, IResultSetExtractor resultSetExtractor) @@ -883,10 +833,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations commandSetterDelegate)); } - #endregion - - #region Queries with ResultSetExtractorDelegate - public virtual T QueryWithResultSetExtractorDelegate(CommandType cmdType, string cmdText, ResultSetExtractorDelegate resultSetExtractorDelegate) @@ -937,10 +883,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations commandSetterDelegate)); } - #endregion - - #region Query for Object - public virtual T QueryForObject(CommandType cmdType, string cmdText, IRowMapper rowMapper) { IList results = QueryWithRowMapper(cmdType, cmdText, rowMapper); @@ -966,10 +908,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations return DataAccessUtils.RequiredUniqueResultSet(results); } - #endregion - - #region Query for ObjectDelegate - public virtual T QueryForObjectDelegate(CommandType cmdType, string cmdText, RowMapperDelegate rowMapperDelegate) { IList results = QueryWithRowMapperDelegate(cmdType, cmdText, rowMapperDelegate); @@ -995,10 +933,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations return DataAccessUtils.RequiredUniqueResultSet(results); } - #endregion - - #region Query with CommandCreator - public virtual T QueryWithCommandCreator(IDbCommandCreator cc, IResultSetExtractor rse) { return QueryWithCommandCreator(cc, rse, null); @@ -1049,10 +983,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations return classicAdoTemplate.Execute(cc, new AdoResultProcessorsQueryCommandCallback(this, namedResultSetProcessors)) as IDictionary; } - #endregion - - #region General Helper Methods - /// /// Checks if DbProvider is not null and creates ExceptionTranslator if not LazyInit. /// @@ -1072,10 +1002,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations return classicAdoTemplate.CreateDataReaderWrapper(readerToWrap); } - #endregion - - #region Parameter Creation Helper Methods - /// /// Derives the parameters of a stored procedure including the return parameter /// @@ -1087,10 +1013,6 @@ public class AdoTemplate : AdoAccessor, IAdoOperations return classicAdoTemplate.DeriveParameters(procedureName, includeReturnParameter); } - #endregion - - #region Internal Helper classes - internal class QueryCallback : IDbCommandCallback, ICommandTextProvider { private AdoTemplate adoTemplate; @@ -1650,6 +1572,4 @@ public class AdoTemplate : AdoAccessor, IAdoOperations return returnedResults; } } - - #endregion } diff --git a/src/Spring/Spring.Data/Data/Generic/CommandDelegate.cs b/src/Spring/Spring.Data/Data/Generic/CommandDelegate.cs index 9317deb6..d67c7ca8 100644 --- a/src/Spring/Spring.Data/Data/Generic/CommandDelegate.cs +++ b/src/Spring/Spring.Data/Data/Generic/CommandDelegate.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data.Common; namespace Spring.Data.Generic; diff --git a/src/Spring/Spring.Data/Data/Generic/DataAdapterDelegate.cs b/src/Spring/Spring.Data/Data/Generic/DataAdapterDelegate.cs index ad6f496e..78279411 100644 --- a/src/Spring/Spring.Data/Data/Generic/DataAdapterDelegate.cs +++ b/src/Spring/Spring.Data/Data/Generic/DataAdapterDelegate.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; namespace Spring.Data.Generic; diff --git a/src/Spring/Spring.Data/Data/Generic/IAdoOperations.cs b/src/Spring/Spring.Data/Data/Generic/IAdoOperations.cs index 9c133a5d..31052f4c 100644 --- a/src/Spring/Spring.Data/Data/Generic/IAdoOperations.cs +++ b/src/Spring/Spring.Data/Data/Generic/IAdoOperations.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Data; using Spring.Data.Common; @@ -30,8 +26,6 @@ namespace Spring.Data.Generic; /// Mark Pollack (.NET) public interface IAdoOperations : ICommonAdoOperations { - #region General Execute Callback Methods - /// /// Execute a ADO.NET operation on a command object using a generic interface based callback. /// @@ -100,10 +94,6 @@ public interface IAdoOperations : ICommonAdoOperations /// A result object returned by the callback or null T Execute(DataAdapterDelegate del); - #endregion - - #region Queries with RowMapper - IList QueryWithRowMapper(CommandType cmdType, string cmdText, IRowMapper rowMapper); IList QueryWithRowMapper(CommandType cmdType, string cmdText, IRowMapper rowMapper, @@ -115,10 +105,6 @@ public interface IAdoOperations : ICommonAdoOperations IList QueryWithRowMapper(CommandType cmdType, string cmdText, IRowMapper rowMapper, IDbParameters parameters); - #endregion - - #region Queries with RowMapperDelegate - IList QueryWithRowMapperDelegate(CommandType cmdType, string cmdText, RowMapperDelegate rowMapperDelegate); IList QueryWithRowMapperDelegate(CommandType cmdType, string cmdText, RowMapperDelegate rowMapperDelegate, @@ -130,10 +116,6 @@ public interface IAdoOperations : ICommonAdoOperations IList QueryWithRowMapperDelegate(CommandType cmdType, string cmdText, RowMapperDelegate rowMapperDelegate, IDbParameters parameters); - #endregion - - #region Queries with ResultSetExtractor - T QueryWithResultSetExtractor(CommandType cmdType, string cmdText, IResultSetExtractor resultSetExtractor); T QueryWithResultSetExtractor(CommandType cmdType, string cmdText, IResultSetExtractor resultSetExtractor, @@ -148,10 +130,6 @@ public interface IAdoOperations : ICommonAdoOperations T QueryWithResultSetExtractor(CommandType cmdType, string cmdText, IResultSetExtractor resultSetExtractor, CommandSetterDelegate commandSetterDelegate); - #endregion - - #region Queries with ResultSetExtractorDelegate - T QueryWithResultSetExtractorDelegate(CommandType cmdType, string cmdText, ResultSetExtractorDelegate resultSetExtractor); T QueryWithResultSetExtractorDelegate(CommandType cmdType, string cmdText, ResultSetExtractorDelegate resultSetExtractor, @@ -166,10 +144,6 @@ public interface IAdoOperations : ICommonAdoOperations T QueryWithResultSetExtractorDelegate(CommandType cmdType, string cmdText, ResultSetExtractorDelegate resultSetExtractor, CommandSetterDelegate commandSetterDelegate); - #endregion - - #region Queries for Object - T QueryForObject(CommandType cmdType, string sql, IRowMapper rowMapper); T QueryForObject(CommandType cmdType, string sql, IRowMapper rowMapper, ICommandSetter commandSetter); @@ -179,10 +153,6 @@ public interface IAdoOperations : ICommonAdoOperations T QueryForObject(CommandType cmdType, string sql, IRowMapper rowMapper, string name, Enum dbType, int size, object parameterValue); - #endregion - - #region Queries for ObjectDelegate - T QueryForObjectDelegate(CommandType cmdType, string sql, RowMapperDelegate rowMapper); T QueryForObjectDelegate(CommandType cmdType, string sql, RowMapperDelegate rowMapper, ICommandSetter commandSetter); @@ -192,10 +162,6 @@ public interface IAdoOperations : ICommonAdoOperations T QueryForObjectDelegate(CommandType cmdType, string sql, RowMapperDelegate rowMapper, string name, Enum dbType, int size, object parameterValue); - #endregion - - #region Query With CommandCreator - T QueryWithCommandCreator(IDbCommandCreator cc, IResultSetExtractor rse); IList QueryWithCommandCreator(IDbCommandCreator cc, IRowMapper rowMapper); @@ -209,10 +175,6 @@ public interface IAdoOperations : ICommonAdoOperations IDictionary QueryWithCommandCreator(IDbCommandCreator cc, IList namedResultSetProcessors); - #endregion - - #region Parameter Creation Helper Methods - IDbParameters CreateDbParameters(); /// @@ -225,10 +187,6 @@ public interface IAdoOperations : ICommonAdoOperations IDataParameter[] DeriveParameters(string procedureName, bool includeReturnParameter); - #endregion - - #region Behavioral Control Properties - /// /// An instance of a DbProvider implementation. /// @@ -252,6 +210,4 @@ public interface IAdoOperations : ICommonAdoOperations /// /// The command timeout. int CommandTimeout { get; set; } - - #endregion } diff --git a/src/Spring/Spring.Data/Data/Generic/ICommandCallback.cs b/src/Spring/Spring.Data/Data/Generic/ICommandCallback.cs index f8dbacb8..0e106b89 100644 --- a/src/Spring/Spring.Data/Data/Generic/ICommandCallback.cs +++ b/src/Spring/Spring.Data/Data/Generic/ICommandCallback.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data.Common; namespace Spring.Data.Generic; diff --git a/src/Spring/Spring.Data/Data/Generic/IDataAdapterCallback.cs b/src/Spring/Spring.Data/Data/Generic/IDataAdapterCallback.cs index 4de4f955..eb77b690 100644 --- a/src/Spring/Spring.Data/Data/Generic/IDataAdapterCallback.cs +++ b/src/Spring/Spring.Data/Data/Generic/IDataAdapterCallback.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; namespace Spring.Data.Generic; diff --git a/src/Spring/Spring.Data/Data/Generic/IDbCommandCallback.cs b/src/Spring/Spring.Data/Data/Generic/IDbCommandCallback.cs index ee9a38cb..ec0876da 100644 --- a/src/Spring/Spring.Data/Data/Generic/IDbCommandCallback.cs +++ b/src/Spring/Spring.Data/Data/Generic/IDbCommandCallback.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; namespace Spring.Data.Generic; diff --git a/src/Spring/Spring.Data/Data/Generic/IDbCommandDelegate.cs b/src/Spring/Spring.Data/Data/Generic/IDbCommandDelegate.cs index e193b6a2..20058fd1 100644 --- a/src/Spring/Spring.Data/Data/Generic/IDbCommandDelegate.cs +++ b/src/Spring/Spring.Data/Data/Generic/IDbCommandDelegate.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; namespace Spring.Data.Generic; diff --git a/src/Spring/Spring.Data/Data/Generic/IResultSetExtractor.cs b/src/Spring/Spring.Data/Data/Generic/IResultSetExtractor.cs index 70235504..aeb81318 100644 --- a/src/Spring/Spring.Data/Data/Generic/IResultSetExtractor.cs +++ b/src/Spring/Spring.Data/Data/Generic/IResultSetExtractor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; namespace Spring.Data.Generic; diff --git a/src/Spring/Spring.Data/Data/Generic/IRowMapper.cs b/src/Spring/Spring.Data/Data/Generic/IRowMapper.cs index bfa7555c..0299c79f 100644 --- a/src/Spring/Spring.Data/Data/Generic/IRowMapper.cs +++ b/src/Spring/Spring.Data/Data/Generic/IRowMapper.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; namespace Spring.Data.Generic; diff --git a/src/Spring/Spring.Data/Data/Generic/ResultSetExtractorDelegate.cs b/src/Spring/Spring.Data/Data/Generic/ResultSetExtractorDelegate.cs index 7a37d05e..5471aad0 100644 --- a/src/Spring/Spring.Data/Data/Generic/ResultSetExtractorDelegate.cs +++ b/src/Spring/Spring.Data/Data/Generic/ResultSetExtractorDelegate.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; namespace Spring.Data.Generic; diff --git a/src/Spring/Spring.Data/Data/Generic/RowMapperDelegate.cs b/src/Spring/Spring.Data/Data/Generic/RowMapperDelegate.cs index fb08d304..0de7e70f 100644 --- a/src/Spring/Spring.Data/Data/Generic/RowMapperDelegate.cs +++ b/src/Spring/Spring.Data/Data/Generic/RowMapperDelegate.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; namespace Spring.Data.Generic; diff --git a/src/Spring/Spring.Data/Data/Generic/RowMapperResultSetExtractor.cs b/src/Spring/Spring.Data/Data/Generic/RowMapperResultSetExtractor.cs index ccd44249..bcc6eeae 100644 --- a/src/Spring/Spring.Data/Data/Generic/RowMapperResultSetExtractor.cs +++ b/src/Spring/Spring.Data/Data/Generic/RowMapperResultSetExtractor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; using Spring.Util; @@ -45,18 +41,12 @@ namespace Spring.Data.Generic; /// Mark Pollack (.NET) public class RowMapperResultSetExtractor : IResultSetExtractor> { - #region Fields - private IRowMapper rowMapper; private RowMapperDelegate rowMapperDelegate; private int rowsExpected; - #endregion - - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -102,10 +92,6 @@ public class RowMapperResultSetExtractor : IResultSetExtractor> this.rowsExpected = rowsExpected; } - #endregion - - #region IResultSetExtractor Members - public IList ExtractData(IDataReader reader) { // Use the more efficient collection if we know how many rows to expect: @@ -137,6 +123,4 @@ public class RowMapperResultSetExtractor : IResultSetExtractor> return results; } - - #endregion } diff --git a/src/Spring/Spring.Data/Data/IAdoOperations.cs b/src/Spring/Spring.Data/Data/IAdoOperations.cs index 38df2e23..ede23461 100644 --- a/src/Spring/Spring.Data/Data/IAdoOperations.cs +++ b/src/Spring/Spring.Data/Data/IAdoOperations.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Data; using Spring.Data.Common; @@ -30,8 +26,6 @@ namespace Spring.Data; /// Mark Pollack (.NET) public interface IAdoOperations : ICommonAdoOperations { - #region General Execute Methods with Callbacks - /// /// Execute a ADO.NET operation on a command object using a delegate callback. /// @@ -67,10 +61,6 @@ public interface IAdoOperations : ICommonAdoOperations /// A result object returned by the callback or null object Execute(IDataAdapterCallback dataAdapterCallback); - #endregion - - #region Queries With ResultSetExtractor - // Static Queries /// @@ -140,10 +130,6 @@ public interface IAdoOperations : ICommonAdoOperations object QueryWithResultSetExtractor(CommandType cmdType, string cmdText, IResultSetExtractor resultSetExtractor, IDbParameters parameters); - #endregion - - #region Queries With ResultSetExtractorDelegate - // Static Queries /// @@ -213,10 +199,6 @@ public interface IAdoOperations : ICommonAdoOperations object QueryWithResultSetExtractorDelegate(CommandType cmdType, string cmdText, ResultSetExtractorDelegate resultSetExtractorDelegate, IDbParameters parameters); - #endregion - - #region Queries with RowMapperDelegate - /// /// Execute a query given static SQL, mapping each row to a .NET object /// via a RowMapper @@ -234,10 +216,6 @@ public interface IAdoOperations : ICommonAdoOperations IList QueryWithRowMapperDelegate(CommandType cmdType, string cmdText, RowMapperDelegate rowMapperDelgate, IDbParameters parameter); - #endregion - - #region Queries with RowMapper - // Static Queries /// @@ -260,10 +238,6 @@ public interface IAdoOperations : ICommonAdoOperations IList QueryWithRowMapper(CommandType cmdType, string cmdText, IRowMapper rowMapper, IDbParameters parameter); - #endregion - - #region Query for Object - /// /// Execute a query with the specified command text, mapping a single result /// row to an object via a RowMapper. @@ -335,10 +309,6 @@ public interface IAdoOperations : ICommonAdoOperations object QueryForObject(CommandType cmdType, string cmdText, IRowMapper rowMapper, string parameterName, Enum dbType, int size, object parameterValue); - #endregion - - #region Query for ObjectDelegate - /// /// Execute a query with the specified command text, mapping a single result /// row to an object via a RowMapper. @@ -404,10 +374,6 @@ public interface IAdoOperations : ICommonAdoOperations object QueryForObjectDelegate(CommandType cmdType, string cmdText, RowMapperDelegate rowMapperDelegate, string parameterName, Enum dbType, int size, object parameterValue); - #endregion - - #region Query With CommandCreator - // Using IResultSetExtractor to process one result set. object QueryWithCommandCreator(IDbCommandCreator commandCreator, IResultSetExtractor resultSetExtractor); @@ -424,10 +390,6 @@ public interface IAdoOperations : ICommonAdoOperations // and multiple output parameters. IDictionary QueryWithCommandCreator(IDbCommandCreator commandCreator, IList resultProcessors); - #endregion - - #region DataTable Create operations without parameters - DataTable DataTableCreate(CommandType commandType, string sql); DataTable DataTableCreate(CommandType commandType, string sql, @@ -440,10 +402,6 @@ public interface IAdoOperations : ICommonAdoOperations ITableMapping tableMapping, IDataAdapterSetter setter); - #endregion - - #region DataTable Create operations with parameters - DataTable DataTableCreateWithParams(CommandType commandType, string sql, IDbParameters parameters); @@ -460,10 +418,6 @@ public interface IAdoOperations : ICommonAdoOperations ITableMapping tableMapping, IDataAdapterSetter dataAdapterSetter); - #endregion - - #region DataTable Fill operations without parameters - /// /// Fill a based on a select command that requires no parameters. /// @@ -483,10 +437,6 @@ public interface IAdoOperations : ICommonAdoOperations ITableMapping tableMapping, IDataAdapterSetter setter); - #endregion - - #region DataTable Fill operations with parameters - int DataTableFillWithParams(DataTable dataTable, CommandType commandType, string sql, IDbParameters parameters); @@ -503,10 +453,6 @@ public interface IAdoOperations : ICommonAdoOperations ITableMapping tableMapping, IDataAdapterSetter dataAdapterSetter); - #endregion - - #region DataTable Update operations - int DataTableUpdateWithCommandBuilder(DataTable dataTable, CommandType commandType, string selectSql, @@ -547,10 +493,6 @@ public interface IAdoOperations : ICommonAdoOperations CommandType deleteCommandtype, string deleteSql, IDbParameters deleteParameters, IDataAdapterSetter dataAdapterSetter); - #endregion - - #region DataSet Create operations without parameters - DataSet DataSetCreate(CommandType commandType, string sql); DataSet DataSetCreate(CommandType commandType, string sql, @@ -568,10 +510,6 @@ public interface IAdoOperations : ICommonAdoOperations IDataAdapterSetter setter, IDataSetFillLifecycleProcessor fillLifecycleProcessor); - #endregion - - #region DataSet Create operations with parameters - DataSet DataSetCreateWithParams(CommandType commandType, string sql, IDbParameters parameters); @@ -594,10 +532,6 @@ public interface IAdoOperations : ICommonAdoOperations IDataAdapterSetter dataAdapterSetter, IDataSetFillLifecycleProcessor fillLifecycleProcessor); - #endregion - - #region DataSet Fill operations without parameters - /// /// Fill a based on a select command that requires no parameters. /// @@ -633,10 +567,6 @@ public interface IAdoOperations : ICommonAdoOperations IDataAdapterSetter setter, IDataSetFillLifecycleProcessor fillLifecycleProcessor); - #endregion - - #region DataSet Fill operations with parameters - int DataSetFillWithParameters(DataSet dataSet, CommandType commandType, string sql, IDbParameters parameters); @@ -659,10 +589,6 @@ public interface IAdoOperations : ICommonAdoOperations IDataAdapterSetter dataAdapterSetter, IDataSetFillLifecycleProcessor fillLifecycleProcessor); - #endregion - - #region DataSet Update operations - int DataSetUpdateWithCommandBuilder(DataSet dataSet, CommandType commandType, string selectSql, @@ -715,10 +641,6 @@ public interface IAdoOperations : ICommonAdoOperations IDbCommand deleteCommand, IDataAdapterSetter dataAdapterSetter); - #endregion - - #region Parameter Creation Helper Methods - IDbParameters CreateDbParameters(); /// @@ -731,10 +653,6 @@ public interface IAdoOperations : ICommonAdoOperations IDataParameter[] DeriveParameters(string procedureName, bool includeReturnParameter); - #endregion - - #region Behavioral Control Properties - /// /// An instance of a DbProvider implementation. /// @@ -758,6 +676,4 @@ public interface IAdoOperations : ICommonAdoOperations /// /// The command timeout. int CommandTimeout { get; set; } - - #endregion } diff --git a/src/Spring/Spring.Data/Data/ICommandCallback.cs b/src/Spring/Spring.Data/Data/ICommandCallback.cs index e03cfcc7..cd514332 100644 --- a/src/Spring/Spring.Data/Data/ICommandCallback.cs +++ b/src/Spring/Spring.Data/Data/ICommandCallback.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; namespace Spring.Data; diff --git a/src/Spring/Spring.Data/Data/ICommandSetter.cs b/src/Spring/Spring.Data/Data/ICommandSetter.cs index a1a5ed8b..2d1f4842 100644 --- a/src/Spring/Spring.Data/Data/ICommandSetter.cs +++ b/src/Spring/Spring.Data/Data/ICommandSetter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; namespace Spring.Data; diff --git a/src/Spring/Spring.Data/Data/ICommandTextProvider.cs b/src/Spring/Spring.Data/Data/ICommandTextProvider.cs index 70947c88..198ea811 100644 --- a/src/Spring/Spring.Data/Data/ICommandTextProvider.cs +++ b/src/Spring/Spring.Data/Data/ICommandTextProvider.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Data; /// diff --git a/src/Spring/Spring.Data/Data/ICommonAdoOperations.cs b/src/Spring/Spring.Data/Data/ICommonAdoOperations.cs index 8eac154e..d46e7e92 100644 --- a/src/Spring/Spring.Data/Data/ICommonAdoOperations.cs +++ b/src/Spring/Spring.Data/Data/ICommonAdoOperations.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Data; using Spring.Data.Common; @@ -26,8 +22,6 @@ namespace Spring.Data; public interface ICommonAdoOperations { - #region ExecuteScalar - /// /// Execute the query with the specified command text returning a scalar result /// @@ -89,10 +83,6 @@ public interface ICommonAdoOperations /// A dictionary containing output parameters, if any IDictionary ExecuteScalar(IDbCommandCreator commandCreator); - #endregion - - #region ExecuteNonQuery - /// /// Executes a non query returning the number of rows affected. /// @@ -150,10 +140,6 @@ public interface ICommonAdoOperations /// The number of rows affected. IDictionary ExecuteNonQuery(IDbCommandCreator commandCreator); - #endregion - - #region Query with RowCallback - /// /// Execute a query given IDbCommand's type and text, reading a /// single result set on a per-row basis with a . @@ -209,10 +195,6 @@ public interface ICommonAdoOperations void QueryWithRowCallback(CommandType cmdType, String cmdText, IRowCallback rowCallback, ICommandSetter commandSetter); - #endregion - - #region Query with RowCallback Delegate - void QueryWithRowCallbackDelegate(CommandType cmdType, string sql, RowCallbackDelegate rowCallbackDelegate); void QueryWithRowCallbackDelegate(CommandType cmdType, string sql, RowCallbackDelegate rowCallbackDelegate, ICommandSetter commandSetter); @@ -222,13 +204,7 @@ public interface ICommonAdoOperations void QueryWithRowCallbackDelegate(CommandType cmdType, string sql, RowCallbackDelegate rowCallbackDelegate, IDbParameters parameters); - #endregion - - #region Query with CommandCreator - void QueryWithCommandCreator(IDbCommandCreator cc, IRowCallback rowCallback); void QueryWithCommandCreator(IDbCommandCreator cc, IRowCallback rowCallback, IDictionary returnedParameters); - - #endregion } diff --git a/src/Spring/Spring.Data/Data/IDataAdapterCallback.cs b/src/Spring/Spring.Data/Data/IDataAdapterCallback.cs index a5d95d25..41738ea5 100644 --- a/src/Spring/Spring.Data/Data/IDataAdapterCallback.cs +++ b/src/Spring/Spring.Data/Data/IDataAdapterCallback.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; namespace Spring.Data; diff --git a/src/Spring/Spring.Data/Data/IDataAdapterSetter.cs b/src/Spring/Spring.Data/Data/IDataAdapterSetter.cs index 5c79453f..ee223c1f 100644 --- a/src/Spring/Spring.Data/Data/IDataAdapterSetter.cs +++ b/src/Spring/Spring.Data/Data/IDataAdapterSetter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; namespace Spring.Data; diff --git a/src/Spring/Spring.Data/Data/IDataReaderWrapper.cs b/src/Spring/Spring.Data/Data/IDataReaderWrapper.cs index 3a25b96c..46c29408 100644 --- a/src/Spring/Spring.Data/Data/IDataReaderWrapper.cs +++ b/src/Spring/Spring.Data/Data/IDataReaderWrapper.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; namespace Spring.Data; diff --git a/src/Spring/Spring.Data/Data/IDataSetFillLifecycleProcessor.cs b/src/Spring/Spring.Data/Data/IDataSetFillLifecycleProcessor.cs index 2744c385..aa9765fc 100644 --- a/src/Spring/Spring.Data/Data/IDataSetFillLifecycleProcessor.cs +++ b/src/Spring/Spring.Data/Data/IDataSetFillLifecycleProcessor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; namespace Spring.Data; diff --git a/src/Spring/Spring.Data/Data/IDbCommandCreator.cs b/src/Spring/Spring.Data/Data/IDbCommandCreator.cs index 4fc1a052..f8b64880 100644 --- a/src/Spring/Spring.Data/Data/IDbCommandCreator.cs +++ b/src/Spring/Spring.Data/Data/IDbCommandCreator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; using Spring.Data.Common; diff --git a/src/Spring/Spring.Data/Data/IDbCommandCreatorFactory.cs b/src/Spring/Spring.Data/Data/IDbCommandCreatorFactory.cs index 8879425c..c2b4314f 100644 --- a/src/Spring/Spring.Data/Data/IDbCommandCreatorFactory.cs +++ b/src/Spring/Spring.Data/Data/IDbCommandCreatorFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Data; using Spring.Dao; @@ -33,8 +29,6 @@ namespace Spring.Data; /// Mark Pollack (.NET) public class IDbCommandCreatorFactory { - #region Fields - private String sql; private IDbParameters declaredParameters; @@ -43,10 +37,6 @@ public class IDbCommandCreatorFactory private CommandType commandType; - #endregion - - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -58,10 +48,6 @@ public class IDbCommandCreatorFactory this.declaredParameters = declaredParameters; } - #endregion - - #region Properties - public IDbParameters DeclaredParameters { get @@ -85,10 +71,6 @@ public class IDbCommandCreatorFactory get { return commandType; } } - #endregion - - #region Methods - public IDbCommandCreator NewDbCommandCreatorWithParamValues(params object[] inParamValues) { return new CommandCreatorWithParamValues(this, inParamValues != null ? ArrayList.Adapter(inParamValues) : new ArrayList()); @@ -99,8 +81,6 @@ public class IDbCommandCreatorFactory return new CommandCreatorImpl(this, inParameters != null ? inParameters : new Hashtable()); } - #endregion - private class CommandCreatorWithParamValues : IDbCommandCreator { private IDbCommandCreatorFactory factory; diff --git a/src/Spring/Spring.Data/Data/IDbDataAdapterCreator.cs b/src/Spring/Spring.Data/Data/IDbDataAdapterCreator.cs index 726a56f7..8f94ce5e 100644 --- a/src/Spring/Spring.Data/Data/IDbDataAdapterCreator.cs +++ b/src/Spring/Spring.Data/Data/IDbDataAdapterCreator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; namespace Spring.Data; diff --git a/src/Spring/Spring.Data/Data/IResultSetExtractor.cs b/src/Spring/Spring.Data/Data/IResultSetExtractor.cs index 99121819..7294a042 100644 --- a/src/Spring/Spring.Data/Data/IResultSetExtractor.cs +++ b/src/Spring/Spring.Data/Data/IResultSetExtractor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; namespace Spring.Data; diff --git a/src/Spring/Spring.Data/Data/IRowMapper.cs b/src/Spring/Spring.Data/Data/IRowMapper.cs index ac4c8012..8ae77fe2 100644 --- a/src/Spring/Spring.Data/Data/IRowMapper.cs +++ b/src/Spring/Spring.Data/Data/IRowMapper.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; namespace Spring.Data; diff --git a/src/Spring/Spring.Data/Data/InvalidResultSetAccessException.cs b/src/Spring/Spring.Data/Data/InvalidResultSetAccessException.cs index 744c6164..b99a1e6e 100644 --- a/src/Spring/Spring.Data/Data/InvalidResultSetAccessException.cs +++ b/src/Spring/Spring.Data/Data/InvalidResultSetAccessException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using Spring.Dao; @@ -30,17 +26,11 @@ namespace Spring.Data; [Serializable] public class InvalidResultSetAccessException : InvalidDataAccessResourceUsageException, ISerializable { - #region Fields - /// /// SQL that led to the problem /// private string sql; - #endregion - - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -79,10 +69,6 @@ public class InvalidResultSetAccessException : InvalidDataAccessResourceUsageExc /// protected InvalidResultSetAccessException(SerializationInfo info, StreamingContext context) : base(info, context) { } - #endregion - - #region Properties - /// /// Gets the SQL that caused the exception /// @@ -95,14 +81,6 @@ public class InvalidResultSetAccessException : InvalidDataAccessResourceUsageExc } } - #endregion - - #region Methods - - #endregion - - #region ISerializable Members - /// /// When overridden in a derived class, sets the /// with information about the exception. @@ -115,6 +93,4 @@ public class InvalidResultSetAccessException : InvalidDataAccessResourceUsageExc info.AddValue("sql", sql); base.GetObjectData(info, context); } - - #endregion } diff --git a/src/Spring/Spring.Data/Data/Objects/AbstractAdoOperation.cs b/src/Spring/Spring.Data/Data/Objects/AbstractAdoOperation.cs index d8b7b94e..5eadc7c7 100644 --- a/src/Spring/Spring.Data/Data/Objects/AbstractAdoOperation.cs +++ b/src/Spring/Spring.Data/Data/Objects/AbstractAdoOperation.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Data; using Microsoft.Extensions.Logging; @@ -34,14 +30,8 @@ namespace Spring.Data.Objects; /// Mark Pollack (.NET) public abstract class AbstractAdoOperation : IInitializingObject { - #region Logging Definition - protected readonly ILogger log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); - #endregion - - #region Fields - private string sql; private CommandType commandType = CommandType.Text; @@ -61,10 +51,6 @@ public abstract class AbstractAdoOperation : IInitializingObject /// private IDbCommandCreatorFactory commandFactory; - #endregion - - #region Properties - /// /// Gets or sets the type of the command. /// @@ -148,10 +134,6 @@ public abstract class AbstractAdoOperation : IInitializingObject set; } - #endregion - - #region Methods - /// /// Ensures compilation if used in an IApplicationContext /// @@ -318,6 +300,4 @@ public abstract class AbstractAdoOperation : IInitializingObject { return commandFactory.NewDbCommandCreatorWithParamValues(inParams); } - - #endregion } diff --git a/src/Spring/Spring.Data/Data/Objects/AdoNonQuery.cs b/src/Spring/Spring.Data/Data/Objects/AdoNonQuery.cs index b72933df..4d1e7c3f 100644 --- a/src/Spring/Spring.Data/Data/Objects/AdoNonQuery.cs +++ b/src/Spring/Spring.Data/Data/Objects/AdoNonQuery.cs @@ -1,5 +1,3 @@ -#region Licence - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Spring.Data.Common; @@ -30,8 +26,6 @@ namespace Spring.Data.Objects; /// The default CommandType is CommandType.Text public class AdoNonQuery : AdoOperation { - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -55,14 +49,6 @@ public class AdoNonQuery : AdoOperation { } - #endregion - - #region Properties - - #endregion - - #region Methods - public IDictionary ExecuteNonQuery(params object[] inParameterValues) { ValidateParameters(inParameterValues); @@ -74,6 +60,4 @@ public class AdoNonQuery : AdoOperation ValidateNamedParameters(inParams); return AdoTemplate.ExecuteNonQuery(NewCommandCreator(inParams)); } - - #endregion } diff --git a/src/Spring/Spring.Data/Data/Objects/AdoOperation.cs b/src/Spring/Spring.Data/Data/Objects/AdoOperation.cs index 591c2478..c7a8b70b 100644 --- a/src/Spring/Spring.Data/Data/Objects/AdoOperation.cs +++ b/src/Spring/Spring.Data/Data/Objects/AdoOperation.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Dao; using Spring.Data.Common; using Spring.Data.Core; @@ -39,14 +35,8 @@ namespace Spring.Data.Objects; /// Mark Pollack (.NET) public abstract class AdoOperation : AbstractAdoOperation { - #region Fields - private AdoTemplate adoTemplate = new AdoTemplate(); - #endregion - - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -84,10 +74,6 @@ public abstract class AdoOperation : AbstractAdoOperation Sql = sql; } - #endregion - - #region Properties - /// /// Gets or sets the ADO template. /// @@ -137,10 +123,6 @@ public abstract class AdoOperation : AbstractAdoOperation set { adoTemplate.CommandTimeout = value; } } - #endregion - - #region Methods - /// /// Compiles this operation. Ignores subsequent attempts to compile. /// @@ -171,6 +153,4 @@ public abstract class AdoOperation : AbstractAdoOperation Compiled = true; } } - - #endregion } diff --git a/src/Spring/Spring.Data/Data/Objects/AdoQuery.cs b/src/Spring/Spring.Data/Data/Objects/AdoQuery.cs index f334dcff..f4351895 100644 --- a/src/Spring/Spring.Data/Data/Objects/AdoQuery.cs +++ b/src/Spring/Spring.Data/Data/Objects/AdoQuery.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Spring.Dao.Support; using Spring.Data.Common; @@ -31,12 +27,6 @@ namespace Spring.Data.Objects; /// Mark Pollack (.NET) public abstract class AdoQuery : AdoOperation { - #region Fields - - #endregion - - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -50,14 +40,6 @@ public abstract class AdoQuery : AdoOperation Sql = sql; } - #endregion - - #region Properties - - #endregion - - #region Methods - public IList Query() { return QueryByNamedParam(null); @@ -99,6 +81,4 @@ public abstract class AdoQuery : AdoOperation } protected abstract IRowMapper NewRowMapper(IDictionary inParams, IDictionary callingContext); - - #endregion } diff --git a/src/Spring/Spring.Data/Data/Objects/AdoScalar.cs b/src/Spring/Spring.Data/Data/Objects/AdoScalar.cs index 3e79dfe8..4eda8ef4 100644 --- a/src/Spring/Spring.Data/Data/Objects/AdoScalar.cs +++ b/src/Spring/Spring.Data/Data/Objects/AdoScalar.cs @@ -1,5 +1,3 @@ -#region Licence - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Spring.Data.Common; @@ -30,8 +26,6 @@ namespace Spring.Data.Objects; /// Mark Pollack (.NET) public class AdoScalar : AdoOperation { - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -55,10 +49,6 @@ public class AdoScalar : AdoOperation { } - #endregion - - #region Methods - public IDictionary ExecuteScalar(params object[] inParameterValues) { ValidateParameters(inParameterValues); @@ -70,6 +60,4 @@ public class AdoScalar : AdoOperation ValidateNamedParameters(inParams); return AdoTemplate.ExecuteScalar(NewCommandCreator(inParams)); } - - #endregion } \ No newline at end of file diff --git a/src/Spring/Spring.Data/Data/Objects/Generic/AdoOperation.cs b/src/Spring/Spring.Data/Data/Objects/Generic/AdoOperation.cs index 690c3bba..80888f08 100644 --- a/src/Spring/Spring.Data/Data/Objects/Generic/AdoOperation.cs +++ b/src/Spring/Spring.Data/Data/Objects/Generic/AdoOperation.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Dao; using Spring.Data.Common; @@ -38,14 +34,8 @@ namespace Spring.Data.Objects.Generic; /// Mark Pollack (.NET) public abstract class AdoOperation : AbstractAdoOperation { - #region Fields - private Data.Generic.AdoTemplate adoTemplate = new Data.Generic.AdoTemplate(); - #endregion - - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -83,10 +73,6 @@ public abstract class AdoOperation : AbstractAdoOperation Sql = sql; } - #endregion - - #region Properties - /// /// Gets or sets the ADO template. /// @@ -136,10 +122,6 @@ public abstract class AdoOperation : AbstractAdoOperation set { adoTemplate.CommandTimeout = value; } } - #endregion - - #region Methods - /// /// Compiles this operation. Ignores subsequent attempts to compile. /// @@ -170,6 +152,4 @@ public abstract class AdoOperation : AbstractAdoOperation Compiled = true; } } - - #endregion } diff --git a/src/Spring/Spring.Data/Data/Objects/Generic/AdoQuery.cs b/src/Spring/Spring.Data/Data/Objects/Generic/AdoQuery.cs index e958cb90..cb22da26 100644 --- a/src/Spring/Spring.Data/Data/Objects/Generic/AdoQuery.cs +++ b/src/Spring/Spring.Data/Data/Objects/Generic/AdoQuery.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Dao.Support.Generic; using Spring.Data.Common; using Spring.Data.Generic; @@ -31,12 +27,6 @@ namespace Spring.Data.Objects.Generic; /// Mark Pollack (.NET) public abstract class AdoQuery : AdoOperation { - #region Fields - - #endregion - - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -55,14 +45,6 @@ public abstract class AdoQuery : AdoOperation Sql = sql; } - #endregion - - #region Properties - - #endregion - - #region Methods - /// /// Convenient method to execute query without parameters or calling context. /// @@ -133,6 +115,4 @@ public abstract class AdoQuery : AdoOperation } protected abstract IRowMapper NewRowMapper(System.Collections.IDictionary inParams, System.Collections.IDictionary callingContext); - - #endregion } diff --git a/src/Spring/Spring.Data/Data/Objects/Generic/MappingAdoQuery.cs b/src/Spring/Spring.Data/Data/Objects/Generic/MappingAdoQuery.cs index 03dec96e..6d0e8982 100644 --- a/src/Spring/Spring.Data/Data/Objects/Generic/MappingAdoQuery.cs +++ b/src/Spring/Spring.Data/Data/Objects/Generic/MappingAdoQuery.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Data; using Spring.Data.Common; @@ -37,8 +33,6 @@ namespace Spring.Data.Objects.Generic; /// Mark Pollack (.NET) public abstract class MappingAdoQuery : MappingAdoQueryWithContext { - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -50,10 +44,6 @@ public abstract class MappingAdoQuery : MappingAdoQueryWithContext { } - #endregion - - #region Methods - protected override T MapRow(IDataReader reader, int rowNum, IDictionary inParams, IDictionary callingContext) { @@ -61,6 +51,4 @@ public abstract class MappingAdoQuery : MappingAdoQueryWithContext } protected abstract T MapRow(IDataReader reader, int num); - - #endregion } \ No newline at end of file diff --git a/src/Spring/Spring.Data/Data/Objects/Generic/MappingAdoQueryWithContext.cs b/src/Spring/Spring.Data/Data/Objects/Generic/MappingAdoQueryWithContext.cs index 687170a8..b8624893 100644 --- a/src/Spring/Spring.Data/Data/Objects/Generic/MappingAdoQueryWithContext.cs +++ b/src/Spring/Spring.Data/Data/Objects/Generic/MappingAdoQueryWithContext.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Data; using Spring.Data.Common; @@ -38,8 +34,6 @@ namespace Spring.Data.Objects.Generic; /// Mark Pollack (.NET) public abstract class MappingAdoQueryWithContext : AdoQuery { - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -51,14 +45,6 @@ public abstract class MappingAdoQueryWithContext : AdoQuery { } - #endregion - - #region Properties - - #endregion - - #region Methods - protected override IRowMapper NewRowMapper(System.Collections.IDictionary inParams, System.Collections.IDictionary callingContext) { @@ -67,8 +53,6 @@ public abstract class MappingAdoQueryWithContext : AdoQuery protected abstract T MapRow(IDataReader reader, int rowNum, IDictionary inParams, IDictionary callingContext); - #endregion - private class RowMapperImpl : IRowMapper { private MappingAdoQueryWithContext outer; diff --git a/src/Spring/Spring.Data/Data/Objects/MappingAdoQuery.cs b/src/Spring/Spring.Data/Data/Objects/MappingAdoQuery.cs index aafb6dfe..cea77d2c 100644 --- a/src/Spring/Spring.Data/Data/Objects/MappingAdoQuery.cs +++ b/src/Spring/Spring.Data/Data/Objects/MappingAdoQuery.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Data; using Spring.Data.Common; @@ -37,8 +33,6 @@ namespace Spring.Data.Objects; /// Mark Pollack (.NET) public abstract class MappingAdoQuery : MappingAdoQueryWithContext { - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -50,10 +44,6 @@ public abstract class MappingAdoQuery : MappingAdoQueryWithContext { } - #endregion - - #region Methods - protected override object MapRow(IDataReader reader, int rowNum, IDictionary inParams, IDictionary callingContext) { @@ -61,6 +51,4 @@ public abstract class MappingAdoQuery : MappingAdoQueryWithContext } protected abstract object MapRow(IDataReader reader, int num); - - #endregion } diff --git a/src/Spring/Spring.Data/Data/Objects/MappingAdoQueryWithContext.cs b/src/Spring/Spring.Data/Data/Objects/MappingAdoQueryWithContext.cs index de4bb8d7..05aa8078 100644 --- a/src/Spring/Spring.Data/Data/Objects/MappingAdoQueryWithContext.cs +++ b/src/Spring/Spring.Data/Data/Objects/MappingAdoQueryWithContext.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Data; using Spring.Data.Common; @@ -37,8 +33,6 @@ namespace Spring.Data.Objects; /// Mark Pollack (.NET) public abstract class MappingAdoQueryWithContext : AdoQuery { - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -50,14 +44,6 @@ public abstract class MappingAdoQueryWithContext : AdoQuery { } - #endregion - - #region Properties - - #endregion - - #region Methods - protected override IRowMapper NewRowMapper(IDictionary inParams, IDictionary callingContext) { return new RowMapperImpl(this, inParams, callingContext); @@ -65,8 +51,6 @@ public abstract class MappingAdoQueryWithContext : AdoQuery protected abstract Object MapRow(IDataReader reader, int rowNum, IDictionary inParams, IDictionary callingContext); - #endregion - private class RowMapperImpl : IRowMapper { private MappingAdoQueryWithContext outer; diff --git a/src/Spring/Spring.Data/Data/ResultSetExtractorDelegate.cs b/src/Spring/Spring.Data/Data/ResultSetExtractorDelegate.cs index 73a754ad..5f0b0379 100644 --- a/src/Spring/Spring.Data/Data/ResultSetExtractorDelegate.cs +++ b/src/Spring/Spring.Data/Data/ResultSetExtractorDelegate.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; namespace Spring.Data; diff --git a/src/Spring/Spring.Data/Data/RowMapperDelegate.cs b/src/Spring/Spring.Data/Data/RowMapperDelegate.cs index cd300b4b..2a16ad48 100644 --- a/src/Spring/Spring.Data/Data/RowMapperDelegate.cs +++ b/src/Spring/Spring.Data/Data/RowMapperDelegate.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; namespace Spring.Data; diff --git a/src/Spring/Spring.Data/Data/Support/AdoTransactionObjectSupport.cs b/src/Spring/Spring.Data/Data/Support/AdoTransactionObjectSupport.cs index 2017c02c..65a4876b 100644 --- a/src/Spring/Spring.Data/Data/Support/AdoTransactionObjectSupport.cs +++ b/src/Spring/Spring.Data/Data/Support/AdoTransactionObjectSupport.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; using Spring.Transaction; using Spring.Transaction.Support; @@ -33,18 +29,12 @@ namespace Spring.Data.Support; /// Mark Pollack (.NET) public abstract class AdoTransactionObjectSupport : ISavepointManager, ISmartTransactionObject { - #region Fields - private ConnectionHolder connectionHolder; private IsolationLevel previousIsolationLevel; private bool savepointAllowed; - #endregion - - #region Properties - public ConnectionHolder ConnectionHolder { get { return connectionHolder; } @@ -75,8 +65,6 @@ public abstract class AdoTransactionObjectSupport : ISavepointManager, ISmartTra /// True of the transaction is marked as rollback-only. public abstract bool RollbackOnly { get; } - #endregion - /// /// Create a new savepoint. /// diff --git a/src/Spring/Spring.Data/Data/Support/AdoUtils.cs b/src/Spring/Spring.Data/Data/Support/AdoUtils.cs index 6c41c5cf..78a10d4b 100644 --- a/src/Spring/Spring.Data/Data/Support/AdoUtils.cs +++ b/src/Spring/Spring.Data/Data/Support/AdoUtils.cs @@ -8,22 +8,14 @@ namespace Spring.Data.Support; /// public abstract class AdoUtils { - #region Logging - private static readonly ILogger LOG = LogManager.GetLogger(typeof(AdoUtils)); - #endregion - - #region Constants - /// /// Order value for TransactionSynchronization objects that clean up /// ADO.NET Connections. /// public static readonly int CONNECTION_SYNCHRONIZATION_ORDER = 1000; - #endregion - /// /// Property dispose of the command. Useful in finally or catch blocks. /// diff --git a/src/Spring/Spring.Data/Data/Support/ConnectionTxPair.cs b/src/Spring/Spring.Data/Data/Support/ConnectionTxPair.cs index 59badbb6..5c8eac0b 100644 --- a/src/Spring/Spring.Data/Data/Support/ConnectionTxPair.cs +++ b/src/Spring/Spring.Data/Data/Support/ConnectionTxPair.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; namespace Spring.Data.Support; diff --git a/src/Spring/Spring.Data/Data/Support/ConnectionUtils.cs b/src/Spring/Spring.Data/Data/Support/ConnectionUtils.cs index 4f354746..f744067f 100644 --- a/src/Spring/Spring.Data/Data/Support/ConnectionUtils.cs +++ b/src/Spring/Spring.Data/Data/Support/ConnectionUtils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; using Microsoft.Extensions.Logging; using Spring.Data.Common; @@ -31,12 +27,8 @@ namespace Spring.Data.Support; /// public abstract class ConnectionUtils { - #region Logging - private static readonly ILogger LOG = LogManager.GetLogger(); - #endregion - public static readonly int CONNECTION_SYNCHRONIZATION_ORDER = 1000; /// diff --git a/src/Spring/Spring.Data/Data/Support/DefaultServiceDomainAdapter.cs b/src/Spring/Spring.Data/Data/Support/DefaultServiceDomainAdapter.cs index 0ad4c54f..b1ca247f 100644 --- a/src/Spring/Spring.Data/Data/Support/DefaultServiceDomainAdapter.cs +++ b/src/Spring/Spring.Data/Data/Support/DefaultServiceDomainAdapter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.EnterpriseServices; namespace Spring.Data.Support; diff --git a/src/Spring/Spring.Data/Data/Support/DefaultTransactionScopeAdapter.cs b/src/Spring/Spring.Data/Data/Support/DefaultTransactionScopeAdapter.cs index c5987b04..9a169fcf 100644 --- a/src/Spring/Spring.Data/Data/Support/DefaultTransactionScopeAdapter.cs +++ b/src/Spring/Spring.Data/Data/Support/DefaultTransactionScopeAdapter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2007 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Transactions; namespace Spring.Data.Support; diff --git a/src/Spring/Spring.Data/Data/Support/ErrorCodeExceptionTranslator.cs b/src/Spring/Spring.Data/Data/Support/ErrorCodeExceptionTranslator.cs index d618a5d1..7092764f 100644 --- a/src/Spring/Spring.Data/Data/Support/ErrorCodeExceptionTranslator.cs +++ b/src/Spring/Spring.Data/Data/Support/ErrorCodeExceptionTranslator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using Spring.Dao; using Spring.Data.Common; @@ -35,27 +31,17 @@ namespace Spring.Data.Support; /// Mark Pollack (.NET) public class ErrorCodeExceptionTranslator : IAdoExceptionTranslator { - #region Fields - private ErrorCodes errorCodes; private IAdoExceptionTranslator fallbackTranslator; private IDbProvider dbProvider; - #endregion - - #region Constants - /// /// The shared log instance for this class (and derived classes). /// protected static readonly ILogger log = LogManager.GetLogger(typeof(ErrorCodeExceptionTranslator)); - #endregion - - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -76,10 +62,6 @@ public class ErrorCodeExceptionTranslator : IAdoExceptionTranslator errorCodes = ec; } - #endregion - - #region Properties - /// /// Sets the db provider. /// @@ -105,8 +87,6 @@ public class ErrorCodeExceptionTranslator : IAdoExceptionTranslator } } - #endregion - /// /// Gets or sets the fallback translator to use in case error code based translation /// fails. @@ -124,10 +104,6 @@ public class ErrorCodeExceptionTranslator : IAdoExceptionTranslator } } - #region Methods - - #endregion - /// /// Translate the given into a generic data access exception. /// diff --git a/src/Spring/Spring.Data/Data/Support/FallbackExceptionTranslator.cs b/src/Spring/Spring.Data/Data/Support/FallbackExceptionTranslator.cs index b173a80e..143296a9 100644 --- a/src/Spring/Spring.Data/Data/Support/FallbackExceptionTranslator.cs +++ b/src/Spring/Spring.Data/Data/Support/FallbackExceptionTranslator.cs @@ -1,5 +1,3 @@ -#region Licence - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Dao; namespace Spring.Data.Support; @@ -32,8 +28,6 @@ namespace Spring.Data.Support; /// Mark Pollack (.NET) public class FallbackExceptionTranslator : IAdoExceptionTranslator { - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -41,8 +35,6 @@ public class FallbackExceptionTranslator : IAdoExceptionTranslator { } - #endregion - /// /// Translate the given into a generic data access exception. /// diff --git a/src/Spring/Spring.Data/Data/Support/IAdoExceptionTranslator.cs b/src/Spring/Spring.Data/Data/Support/IAdoExceptionTranslator.cs index 9078a2e0..dfcfe3b4 100644 --- a/src/Spring/Spring.Data/Data/Support/IAdoExceptionTranslator.cs +++ b/src/Spring/Spring.Data/Data/Support/IAdoExceptionTranslator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Dao; namespace Spring.Data.Support; diff --git a/src/Spring/Spring.Data/Data/Support/IServiceDomainAdapter.cs b/src/Spring/Spring.Data/Data/Support/IServiceDomainAdapter.cs index 35c6dbd4..2612aee4 100644 --- a/src/Spring/Spring.Data/Data/Support/IServiceDomainAdapter.cs +++ b/src/Spring/Spring.Data/Data/Support/IServiceDomainAdapter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.EnterpriseServices; namespace Spring.Data.Support; diff --git a/src/Spring/Spring.Data/Data/Support/ITransactionScopeAdapter.cs b/src/Spring/Spring.Data/Data/Support/ITransactionScopeAdapter.cs index ff726248..48aba85d 100644 --- a/src/Spring/Spring.Data/Data/Support/ITransactionScopeAdapter.cs +++ b/src/Spring/Spring.Data/Data/Support/ITransactionScopeAdapter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2007 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Transactions; namespace Spring.Data.Support; diff --git a/src/Spring/Spring.Data/Data/Support/NullMappingDataReader.cs b/src/Spring/Spring.Data/Data/Support/NullMappingDataReader.cs index e3147020..c0eee38a 100644 --- a/src/Spring/Spring.Data/Data/Support/NullMappingDataReader.cs +++ b/src/Spring/Spring.Data/Data/Support/NullMappingDataReader.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; namespace Spring.Data.Support; @@ -29,15 +25,9 @@ namespace Spring.Data.Support; /// Mark Pollack (.NET) public class NullMappingDataReader : IDataReaderWrapper { - #region Fields - protected IDataReader dataReader; private bool alreadyDisposed = false; - #endregion - - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -54,15 +44,11 @@ public class NullMappingDataReader : IDataReaderWrapper this.dataReader = dataReader; } - #endregion - ~NullMappingDataReader() { Dispose(false); } - #region Methods - protected virtual void Dispose(bool isDisposing) { // Don't dispose more than once @@ -80,10 +66,6 @@ public class NullMappingDataReader : IDataReaderWrapper alreadyDisposed = true; } - #endregion - - #region IDataReaderWrapper Members - public IDataReader WrappedReader { get @@ -96,10 +78,6 @@ public class NullMappingDataReader : IDataReaderWrapper } } - #endregion - - #region IDataReader Members - public int RecordsAffected { get @@ -144,20 +122,12 @@ public class NullMappingDataReader : IDataReaderWrapper return dataReader.GetSchemaTable(); } - #endregion - - #region IDisposable Members - public void Dispose() { Dispose(true); GC.SuppressFinalize(true); } - #endregion - - #region IDataRecord Members - /// /// Gets the 32-bit signed integer value of the specified field. /// @@ -337,6 +307,4 @@ public class NullMappingDataReader : IDataReaderWrapper { return dataReader.IsDBNull(i) ? (short) 0 : dataReader.GetInt16(i); } - - #endregion } diff --git a/src/Spring/Spring.Data/Data/Support/ParameterUtils.cs b/src/Spring/Spring.Data/Data/Support/ParameterUtils.cs index 62d16e2f..d4c33c86 100644 --- a/src/Spring/Spring.Data/Data/Support/ParameterUtils.cs +++ b/src/Spring/Spring.Data/Data/Support/ParameterUtils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Data; using Microsoft.Extensions.Logging; @@ -31,21 +27,11 @@ namespace Spring.Data.Support; /// Mark Pollack (.NET) public class ParameterUtils { - #region Fields - - #endregion - - #region Constants - /// /// The shared log instance for this class (and derived classes). /// protected static readonly ILogger log = LogManager.GetLogger(typeof(ParameterUtils)); - #endregion - - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -53,14 +39,6 @@ public class ParameterUtils { } - #endregion - - #region Properties - - #endregion - - #region Methods - /// /// Copies the parameters from IDbParameters to the parameter collection in IDbCommand /// @@ -114,8 +92,6 @@ public class ParameterUtils } } - #endregion - public static void ExtractOutputParameters(IDictionary returnedParameters, IDbCommand command) { if (returnedParameters == null) diff --git a/src/Spring/Spring.Data/Data/Support/RowCallbackResultSetExtractor.cs b/src/Spring/Spring.Data/Data/Support/RowCallbackResultSetExtractor.cs index d328e1b8..2e50ec2f 100644 --- a/src/Spring/Spring.Data/Data/Support/RowCallbackResultSetExtractor.cs +++ b/src/Spring/Spring.Data/Data/Support/RowCallbackResultSetExtractor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; using Spring.Util; diff --git a/src/Spring/Spring.Data/Data/Support/SimpleServiceConfig.cs b/src/Spring/Spring.Data/Data/Support/SimpleServiceConfig.cs index fb7d32e7..77a3a952 100644 --- a/src/Spring/Spring.Data/Data/Support/SimpleServiceConfig.cs +++ b/src/Spring/Spring.Data/Data/Support/SimpleServiceConfig.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.EnterpriseServices; namespace Spring.Data.Support; diff --git a/src/Spring/Spring.Data/Data/Support/TypedDataSetUtils.cs b/src/Spring/Spring.Data/Data/Support/TypedDataSetUtils.cs index c74b4334..5f98dd65 100644 --- a/src/Spring/Spring.Data/Data/Support/TypedDataSetUtils.cs +++ b/src/Spring/Spring.Data/Data/Support/TypedDataSetUtils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; using System.Reflection; using Microsoft.Extensions.Logging; diff --git a/src/Spring/Spring.Data/Data/UncategorizedAdoException.cs b/src/Spring/Spring.Data/Data/UncategorizedAdoException.cs index ebc879b4..108831cc 100644 --- a/src/Spring/Spring.Data/Data/UncategorizedAdoException.cs +++ b/src/Spring/Spring.Data/Data/UncategorizedAdoException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using Spring.Dao; @@ -31,8 +27,6 @@ namespace Spring.Data; [Serializable] public class UncategorizedAdoException : UncategorizedDataAccessException, ISerializable { - #region Fields - /// /// SQL that led to the problem /// @@ -43,10 +37,6 @@ public class UncategorizedAdoException : UncategorizedDataAccessException, ISeri /// private readonly string errorCode; - #endregion - - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -87,10 +77,6 @@ public class UncategorizedAdoException : UncategorizedDataAccessException, ISeri /// protected UncategorizedAdoException(SerializationInfo info, StreamingContext context) : base(info, context) { } - #endregion - - #region Properties - /// /// Return the underlying error code if available from the underlying provider. /// @@ -107,14 +93,6 @@ public class UncategorizedAdoException : UncategorizedDataAccessException, ISeri get { return sql; } } - #endregion - - #region Methods - - #endregion - - #region ISerializable Members - /// /// When overridden in a derived class, sets the /// with information about the exception. @@ -128,6 +106,4 @@ public class UncategorizedAdoException : UncategorizedDataAccessException, ISeri info.AddValue("errorCode", errorCode); base.GetObjectData(info, context); } - - #endregion } diff --git a/src/Spring/Spring.Data/Transaction/CannotCreateTransactionException.cs b/src/Spring/Spring.Data/Transaction/CannotCreateTransactionException.cs index 44f75a86..ddc68936 100644 --- a/src/Spring/Spring.Data/Transaction/CannotCreateTransactionException.cs +++ b/src/Spring/Spring.Data/Transaction/CannotCreateTransactionException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Transaction; diff --git a/src/Spring/Spring.Data/Transaction/Config/AttributeDrivenObjectDefinitionParser.cs b/src/Spring/Spring.Data/Transaction/Config/AttributeDrivenObjectDefinitionParser.cs index 58b0d9aa..c3f02ff1 100644 --- a/src/Spring/Spring.Data/Transaction/Config/AttributeDrivenObjectDefinitionParser.cs +++ b/src/Spring/Spring.Data/Transaction/Config/AttributeDrivenObjectDefinitionParser.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Xml; using Spring.Aop.Config; using Spring.Objects.Factory.Config; diff --git a/src/Spring/Spring.Data/Transaction/Config/TxAdviceObjectDefinitionParser.cs b/src/Spring/Spring.Data/Transaction/Config/TxAdviceObjectDefinitionParser.cs index 6c7ede55..1af8e98b 100644 --- a/src/Spring/Spring.Data/Transaction/Config/TxAdviceObjectDefinitionParser.cs +++ b/src/Spring/Spring.Data/Transaction/Config/TxAdviceObjectDefinitionParser.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; using System.Xml; using Spring.Objects.Factory.Config; diff --git a/src/Spring/Spring.Data/Transaction/Config/TxNamespaceParser.cs b/src/Spring/Spring.Data/Transaction/Config/TxNamespaceParser.cs index 84ed4bda..79848139 100644 --- a/src/Spring/Spring.Data/Transaction/Config/TxNamespaceParser.cs +++ b/src/Spring/Spring.Data/Transaction/Config/TxNamespaceParser.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects.Factory.Xml; namespace Spring.Transaction.Config; diff --git a/src/Spring/Spring.Data/Transaction/Config/TxNamespaceUtils.cs b/src/Spring/Spring.Data/Transaction/Config/TxNamespaceUtils.cs index 223133d0..cc804ddd 100644 --- a/src/Spring/Spring.Data/Transaction/Config/TxNamespaceUtils.cs +++ b/src/Spring/Spring.Data/Transaction/Config/TxNamespaceUtils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Core; namespace Spring.Transaction.Config; diff --git a/src/Spring/Spring.Data/Transaction/HeuristicCompletionException.cs b/src/Spring/Spring.Data/Transaction/HeuristicCompletionException.cs index 7e1a6be9..7f65aa06 100644 --- a/src/Spring/Spring.Data/Transaction/HeuristicCompletionException.cs +++ b/src/Spring/Spring.Data/Transaction/HeuristicCompletionException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Transaction; diff --git a/src/Spring/Spring.Data/Transaction/IPlatformTransactionManager.cs b/src/Spring/Spring.Data/Transaction/IPlatformTransactionManager.cs index 4ec9c756..ab891b7e 100644 --- a/src/Spring/Spring.Data/Transaction/IPlatformTransactionManager.cs +++ b/src/Spring/Spring.Data/Transaction/IPlatformTransactionManager.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Transaction; /// diff --git a/src/Spring/Spring.Data/Transaction/ISavepointManager.cs b/src/Spring/Spring.Data/Transaction/ISavepointManager.cs index dcebe210..29aba970 100644 --- a/src/Spring/Spring.Data/Transaction/ISavepointManager.cs +++ b/src/Spring/Spring.Data/Transaction/ISavepointManager.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Transaction; /// diff --git a/src/Spring/Spring.Data/Transaction/ITransactionDefinition.cs b/src/Spring/Spring.Data/Transaction/ITransactionDefinition.cs index f8993dc0..ba000d01 100644 --- a/src/Spring/Spring.Data/Transaction/ITransactionDefinition.cs +++ b/src/Spring/Spring.Data/Transaction/ITransactionDefinition.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; namespace Spring.Transaction; diff --git a/src/Spring/Spring.Data/Transaction/ITransactionStatus.cs b/src/Spring/Spring.Data/Transaction/ITransactionStatus.cs index c77d3a4d..8677a2a3 100644 --- a/src/Spring/Spring.Data/Transaction/ITransactionStatus.cs +++ b/src/Spring/Spring.Data/Transaction/ITransactionStatus.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Transaction; /// diff --git a/src/Spring/Spring.Data/Transaction/IllegalTransactionStateException.cs b/src/Spring/Spring.Data/Transaction/IllegalTransactionStateException.cs index 77d15d17..7c4f85b9 100644 --- a/src/Spring/Spring.Data/Transaction/IllegalTransactionStateException.cs +++ b/src/Spring/Spring.Data/Transaction/IllegalTransactionStateException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Transaction; diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/AbstractTransactionAttributeSourcePointcut.cs b/src/Spring/Spring.Data/Transaction/Interceptor/AbstractTransactionAttributeSourcePointcut.cs index d8ba4e24..05ec9171 100644 --- a/src/Spring/Spring.Data/Transaction/Interceptor/AbstractTransactionAttributeSourcePointcut.cs +++ b/src/Spring/Spring.Data/Transaction/Interceptor/AbstractTransactionAttributeSourcePointcut.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using Spring.Aop.Support; @@ -25,8 +21,6 @@ namespace Spring.Transaction.Interceptor; public abstract class AbstractTransactionAttributeSourcePointcut : StaticMethodMatcherPointcut { - #region Overrides of StaticMethodMatcher - /// /// Does the supplied satisfy this matcher? /// @@ -51,7 +45,5 @@ public abstract class AbstractTransactionAttributeSourcePointcut : StaticMethodM return (tas == null || TransactionAttributeSource.ReturnTransactionAttribute(method, targetType) != null); } - #endregion - protected abstract ITransactionAttributeSource TransactionAttributeSource { get; } } diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/AttributesTransactionAttributeSource.cs b/src/Spring/Spring.Data/Transaction/Interceptor/AttributesTransactionAttributeSource.cs index 817db7e6..b89f920d 100644 --- a/src/Spring/Spring.Data/Transaction/Interceptor/AttributesTransactionAttributeSource.cs +++ b/src/Spring/Spring.Data/Transaction/Interceptor/AttributesTransactionAttributeSource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; namespace Spring.Transaction.Interceptor; diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/DefaultTransactionAttributeSourceAdvisor.cs b/src/Spring/Spring.Data/Transaction/Interceptor/DefaultTransactionAttributeSourceAdvisor.cs index 3374c61a..877e0ea2 100644 --- a/src/Spring/Spring.Data/Transaction/Interceptor/DefaultTransactionAttributeSourceAdvisor.cs +++ b/src/Spring/Spring.Data/Transaction/Interceptor/DefaultTransactionAttributeSourceAdvisor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using AopAlliance.Aop; using Spring.Aop.Framework; diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/DelegatingTransactionAttributeWithName.cs b/src/Spring/Spring.Data/Transaction/Interceptor/DelegatingTransactionAttributeWithName.cs index 5f9f7649..01f43008 100644 --- a/src/Spring/Spring.Data/Transaction/Interceptor/DelegatingTransactionAttributeWithName.cs +++ b/src/Spring/Spring.Data/Transaction/Interceptor/DelegatingTransactionAttributeWithName.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Transactions; using IsolationLevel = System.Data.IsolationLevel; diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/ITransactionAttribute.cs b/src/Spring/Spring.Data/Transaction/Interceptor/ITransactionAttribute.cs index f2722b5f..8ad6c7f6 100644 --- a/src/Spring/Spring.Data/Transaction/Interceptor/ITransactionAttribute.cs +++ b/src/Spring/Spring.Data/Transaction/Interceptor/ITransactionAttribute.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.ComponentModel; namespace Spring.Transaction.Interceptor; diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/ITransactionAttributeSource.cs b/src/Spring/Spring.Data/Transaction/Interceptor/ITransactionAttributeSource.cs index ba77aac2..42e01834 100644 --- a/src/Spring/Spring.Data/Transaction/Interceptor/ITransactionAttributeSource.cs +++ b/src/Spring/Spring.Data/Transaction/Interceptor/ITransactionAttributeSource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; namespace Spring.Transaction.Interceptor; diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/MatchAlwaysTransactionAttributeSource.cs b/src/Spring/Spring.Data/Transaction/Interceptor/MatchAlwaysTransactionAttributeSource.cs index 969f683a..2be1e2df 100644 --- a/src/Spring/Spring.Data/Transaction/Interceptor/MatchAlwaysTransactionAttributeSource.cs +++ b/src/Spring/Spring.Data/Transaction/Interceptor/MatchAlwaysTransactionAttributeSource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; namespace Spring.Transaction.Interceptor; @@ -61,8 +57,6 @@ public class MatchAlwaysTransactionAttributeSource : ITransactionAttributeSource set { _transactionAttribute = value; } } - #region ITransactionAttributeSource Members - /// /// Return the for this /// method. @@ -81,8 +75,6 @@ public class MatchAlwaysTransactionAttributeSource : ITransactionAttributeSource return _transactionAttribute; } - #endregion - /// /// Determines whether the specified is equal to the current . /// diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/MethodMapTransactionAttributeSource.cs b/src/Spring/Spring.Data/Transaction/Interceptor/MethodMapTransactionAttributeSource.cs index e66daf3b..0884bafb 100644 --- a/src/Spring/Spring.Data/Transaction/Interceptor/MethodMapTransactionAttributeSource.cs +++ b/src/Spring/Spring.Data/Transaction/Interceptor/MethodMapTransactionAttributeSource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Reflection; using Microsoft.Extensions.Logging; @@ -39,12 +35,8 @@ public class MethodMapTransactionAttributeSource : ITransactionAttributeSource private IDictionary _methodMap; private IDictionary _nameMap; - #region Logging Definition - private static readonly ILogger LOG = LogManager.GetLogger(typeof(MethodMapTransactionAttributeSource)); - #endregion - /// /// Creates a new instance of the /// class. @@ -224,8 +216,6 @@ public class MethodMapTransactionAttributeSource : ITransactionAttributeSource return PatternMatchUtils.SimpleMatch(mappedName, methodName); } - #region ITransactionAttributeSource Members - /// /// Return the for this /// method. @@ -286,6 +276,4 @@ public class MethodMapTransactionAttributeSource : ITransactionAttributeSource return (ITransactionAttribute) _methodMap[method]; } - - #endregion } diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/NameMatchTransactionAttributeSource.cs b/src/Spring/Spring.Data/Transaction/Interceptor/NameMatchTransactionAttributeSource.cs index 990032a3..1b82f4e4 100644 --- a/src/Spring/Spring.Data/Transaction/Interceptor/NameMatchTransactionAttributeSource.cs +++ b/src/Spring/Spring.Data/Transaction/Interceptor/NameMatchTransactionAttributeSource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Collections.Specialized; using System.Reflection; @@ -157,15 +153,11 @@ public class NameMatchTransactionAttributeSource : ITransactionAttributeSource, /// public void AddTransactionMethod(string methodName, ITransactionAttribute attribute) { - #region Instrumentation - if (log.IsEnabled(LogLevel.Debug)) { log.LogDebug("Adding transactional method [" + methodName + "] with attribute [" + attribute + "]"); } - #endregion - nameMap.Add(methodName, attribute); } @@ -190,8 +182,6 @@ public class NameMatchTransactionAttributeSource : ITransactionAttributeSource, } } - #region ITransactionAttributeSource Members - /// /// Return the for this /// method. @@ -228,6 +218,4 @@ public class NameMatchTransactionAttributeSource : ITransactionAttributeSource, return attribute; } - - #endregion } diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/NoRollbackRuleAttribute.cs b/src/Spring/Spring.Data/Transaction/Interceptor/NoRollbackRuleAttribute.cs index fd9d9498..e2591899 100644 --- a/src/Spring/Spring.Data/Transaction/Interceptor/NoRollbackRuleAttribute.cs +++ b/src/Spring/Spring.Data/Transaction/Interceptor/NoRollbackRuleAttribute.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Transaction.Interceptor; /// diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/ObjectFactoryTransactionAttributeSourceAdvisor.cs b/src/Spring/Spring.Data/Transaction/Interceptor/ObjectFactoryTransactionAttributeSourceAdvisor.cs index 68f93c19..1fa72ce7 100644 --- a/src/Spring/Spring.Data/Transaction/Interceptor/ObjectFactoryTransactionAttributeSourceAdvisor.cs +++ b/src/Spring/Spring.Data/Transaction/Interceptor/ObjectFactoryTransactionAttributeSourceAdvisor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Aop; using Spring.Aop.Support; @@ -42,14 +38,10 @@ public class ObjectFactoryTransactionAttributeSourceAdvisor : AbstractObjectFact this.outer = outer; } - #region Overrides of AbstractTransactionAttributeSourcePointcut - protected override ITransactionAttributeSource TransactionAttributeSource { get { return outer._transactionAttributeSource; } } - - #endregion } public ITransactionAttributeSource TransactionAttributeSource @@ -57,8 +49,6 @@ public class ObjectFactoryTransactionAttributeSourceAdvisor : AbstractObjectFact set { _transactionAttributeSource = value; } } - #region Overrides of AbstractPointcutAdvisor - /// /// The that drives this advisor. /// @@ -67,6 +57,4 @@ public class ObjectFactoryTransactionAttributeSourceAdvisor : AbstractObjectFact get { return _pointcut; } set { _pointcut = value; } } - - #endregion } \ No newline at end of file diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/RollbackRuleAttribute.cs b/src/Spring/Spring.Data/Transaction/Interceptor/RollbackRuleAttribute.cs index 0d08a167..bfc4ff69 100644 --- a/src/Spring/Spring.Data/Transaction/Interceptor/RollbackRuleAttribute.cs +++ b/src/Spring/Spring.Data/Transaction/Interceptor/RollbackRuleAttribute.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Util; namespace Spring.Transaction.Interceptor; diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/RuleBasedTransactionAttribute.cs b/src/Spring/Spring.Data/Transaction/Interceptor/RuleBasedTransactionAttribute.cs index d1b3eea4..232fbc08 100644 --- a/src/Spring/Spring.Data/Transaction/Interceptor/RuleBasedTransactionAttribute.cs +++ b/src/Spring/Spring.Data/Transaction/Interceptor/RuleBasedTransactionAttribute.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Text; using Spring.Collections; diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAspectSupport.cs b/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAspectSupport.cs index de0be6e9..cc7ab8d0 100644 --- a/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAspectSupport.cs +++ b/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAspectSupport.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections.Specialized; using System.Reflection; using Microsoft.Extensions.Logging; @@ -58,8 +54,6 @@ public class TransactionAspectSupport : IInitializingObject { //TODO work on serialization support. - #region TransactionInfo Class - /// /// Opaque object used to hold transaction information. /// @@ -156,14 +150,8 @@ public class TransactionAspectSupport : IInitializingObject } } - #endregion - - #region Logging Definition - [NonSerialized] protected ILogger log = LogManager.GetLogger(typeof(TransactionAspectSupport)); - #endregion - /// /// The name in thread local storage where the TransactionInfo object is located /// @@ -349,15 +337,11 @@ public class TransactionAspectSupport : IInitializingObject { // We need a transaction for this method - #region Instrumentation - if (log.IsEnabled(LogLevel.Debug)) { log.LogDebug("Getting transaction for " + transactionInfo.JoinpointIdentification); } - #endregion - // The transaction manager will flag an error if an incompatible tx already exists transactionInfo.TransactionStatus = _transactionManager.GetTransaction(txAttr); } @@ -407,15 +391,11 @@ public class TransactionAspectSupport : IInitializingObject { if (transactionInfo != null && transactionInfo.HasTransaction) { - #region Instrumentation - if (log.IsEnabled(LogLevel.Debug)) { log.LogDebug("Completing transaction for [" + transactionInfo.JoinpointIdentification + "]"); } - #endregion - _transactionManager.Commit(transactionInfo.TransactionStatus); } } diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttributeConverter.cs b/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttributeConverter.cs index a7f85120..86948252 100644 --- a/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttributeConverter.cs +++ b/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttributeConverter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.ComponentModel; using System.Globalization; diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttributeEditor.cs b/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttributeEditor.cs index d740425a..42626eed 100644 --- a/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttributeEditor.cs +++ b/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttributeEditor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; using Spring.Util; diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttributeSourceAdvisor.cs b/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttributeSourceAdvisor.cs index ef3157f4..a0c8be98 100644 --- a/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttributeSourceAdvisor.cs +++ b/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttributeSourceAdvisor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using Spring.Aop.Framework; using Spring.Aop.Support; @@ -41,14 +37,8 @@ namespace Spring.Transaction.Interceptor; [Serializable] public class TransactionAttributeSourceAdvisor : StaticMethodMatcherPointcutAdvisor { - #region Fields - private ITransactionAttributeSource _transactionAttributeSource; - #endregion - - #region Constructor(s) - /// /// Initializes a new instance of the class. /// @@ -75,10 +65,6 @@ public class TransactionAttributeSourceAdvisor : StaticMethodMatcherPointcutAdvi SetTxAttributeSource(transactionInterceptor); } - #endregion - - #region Properties - /// /// Sets the transaction interceptor. /// @@ -93,10 +79,6 @@ public class TransactionAttributeSourceAdvisor : StaticMethodMatcherPointcutAdvi } } - #endregion - - #region Methods - /// /// Tests the input method to see if it's covered by the advisor. /// @@ -124,6 +106,4 @@ public class TransactionAttributeSourceAdvisor : StaticMethodMatcherPointcutAdvi _transactionAttributeSource = transactionInterceptor.TransactionAttributeSource; } - - #endregion } \ No newline at end of file diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttributeSourceEditor.cs b/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttributeSourceEditor.cs index fa20e6e7..8996eddf 100644 --- a/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttributeSourceEditor.cs +++ b/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttributeSourceEditor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Spring.Util; @@ -52,8 +48,6 @@ namespace Spring.Transaction.Interceptor; /// Griffin Caprio (.NET) public class TransactionAttributeSourceEditor { - #region PropertiesEditor Class - /// /// Internal class to parse property values. /// @@ -99,8 +93,6 @@ public class TransactionAttributeSourceEditor } } - #endregion - private ITransactionAttributeSource _attributeSource; /// diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/TransactionInterceptor.cs b/src/Spring/Spring.Data/Transaction/Interceptor/TransactionInterceptor.cs index 4cb722c4..e546b14b 100644 --- a/src/Spring/Spring.Data/Transaction/Interceptor/TransactionInterceptor.cs +++ b/src/Spring/Spring.Data/Transaction/Interceptor/TransactionInterceptor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using AopAlliance.Intercept; diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/TransactionProxyFactoryObject.cs b/src/Spring/Spring.Data/Transaction/Interceptor/TransactionProxyFactoryObject.cs index 8acef24c..bdffb1dc 100644 --- a/src/Spring/Spring.Data/Transaction/Interceptor/TransactionProxyFactoryObject.cs +++ b/src/Spring/Spring.Data/Transaction/Interceptor/TransactionProxyFactoryObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections.Specialized; using Spring.Aop; using Spring.Aop.Framework; @@ -222,8 +218,6 @@ public class TransactionProxyFactoryObject : ProxyConfig, IFactoryObject, IIniti set { _advisorAdapterRegistry = value; } } - #region IFactoryObject Members - /// /// Returns the object for this proxy factory. /// @@ -266,10 +260,6 @@ public class TransactionProxyFactoryObject : ProxyConfig, IFactoryObject, IIniti } } - #endregion - - #region IInitializingObject Members - /// /// Method run after all the properties have been set for this object. /// Responsible for actual proxy creation. @@ -331,8 +321,6 @@ public class TransactionProxyFactoryObject : ProxyConfig, IFactoryObject, IIniti _proxy = proxyFactory.GetProxy(); } - #endregion - /// /// Set the target or . /// diff --git a/src/Spring/Spring.Data/Transaction/InvalidIsolationLevelException.cs b/src/Spring/Spring.Data/Transaction/InvalidIsolationLevelException.cs index 09fa4bda..8d230646 100644 --- a/src/Spring/Spring.Data/Transaction/InvalidIsolationLevelException.cs +++ b/src/Spring/Spring.Data/Transaction/InvalidIsolationLevelException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Transaction; diff --git a/src/Spring/Spring.Data/Transaction/InvalidTimeoutException.cs b/src/Spring/Spring.Data/Transaction/InvalidTimeoutException.cs index 08105d05..853f1585 100644 --- a/src/Spring/Spring.Data/Transaction/InvalidTimeoutException.cs +++ b/src/Spring/Spring.Data/Transaction/InvalidTimeoutException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Transaction; diff --git a/src/Spring/Spring.Data/Transaction/NestedTransactionNotSupportedException.cs b/src/Spring/Spring.Data/Transaction/NestedTransactionNotSupportedException.cs index 920308a1..54d1bf20 100644 --- a/src/Spring/Spring.Data/Transaction/NestedTransactionNotSupportedException.cs +++ b/src/Spring/Spring.Data/Transaction/NestedTransactionNotSupportedException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Transaction; diff --git a/src/Spring/Spring.Data/Transaction/NoTransactionException.cs b/src/Spring/Spring.Data/Transaction/NoTransactionException.cs index 11774071..b48ea7c3 100644 --- a/src/Spring/Spring.Data/Transaction/NoTransactionException.cs +++ b/src/Spring/Spring.Data/Transaction/NoTransactionException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Transaction; diff --git a/src/Spring/Spring.Data/Transaction/Support/AbstractPlatformTransactionManager.cs b/src/Spring/Spring.Data/Transaction/Support/AbstractPlatformTransactionManager.cs index f88bb892..c751118f 100644 --- a/src/Spring/Spring.Data/Transaction/Support/AbstractPlatformTransactionManager.cs +++ b/src/Spring/Spring.Data/Transaction/Support/AbstractPlatformTransactionManager.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Data; using Microsoft.Extensions.Logging; @@ -56,8 +52,6 @@ namespace Spring.Transaction.Support; [Serializable] public abstract class AbstractPlatformTransactionManager : IPlatformTransactionManager { - #region Private SuspendedResourcesHolder Helper class - private class SuspendedResourcesHolder { private IList _suspendedSynchronizations; @@ -114,31 +108,19 @@ public abstract class AbstractPlatformTransactionManager : IPlatformTransactionM } } - #endregion - - #region Private Variables - private TransactionSynchronizationState _transactionSyncState = TransactionSynchronizationState.Never; private bool _nestedTransactionsAllowed; private bool _rollbackOnCommitFailure; private bool _failEarlyOnGlobalRollbackOnly; private int _defaultTimeout = DefaultTransactionDefinition.TIMEOUT_DEFAULT; - #region Logging Definition - [NonSerialized()] protected readonly ILogger log; - #endregion - protected AbstractPlatformTransactionManager() { log = LogManager.GetLogger(this.GetType()); } - #endregion - - #region Public Properties - /// /// Sets and gets when this transaction manager should activate the thread-bound /// transaction synchronization support. Default is "always". @@ -232,10 +214,6 @@ public abstract class AbstractPlatformTransactionManager : IPlatformTransactionM } } - #endregion - - #region Protected Methods - /// /// Return the current transaction object. /// @@ -469,10 +447,6 @@ public abstract class AbstractPlatformTransactionManager : IPlatformTransactionM { } - #endregion - - #region IPlatformTransactionManager Members - /// /// Return a currently active transaction or create a new one. /// @@ -978,10 +952,6 @@ public abstract class AbstractPlatformTransactionManager : IPlatformTransactionM } } - #endregion - - #region Protected Method - private DefaultTransactionStatus NewTransactionStatus(ITransactionDefinition definition, object transaction, bool newTransaction, bool newSynchronization, bool debug, @@ -1019,10 +989,6 @@ public abstract class AbstractPlatformTransactionManager : IPlatformTransactionM return _defaultTimeout; } - #endregion - - #region Private Methods - /// /// Suspend the given transaction. Suspends transaction synchronization first, /// then delegates to the doSuspend template method. @@ -1285,6 +1251,4 @@ public abstract class AbstractPlatformTransactionManager : IPlatformTransactionM Resume(status.Transaction, status.SuspendedResources); } } - - #endregion } diff --git a/src/Spring/Spring.Data/Transaction/Support/DefaultTransactionStatus.cs b/src/Spring/Spring.Data/Transaction/Support/DefaultTransactionStatus.cs index 8fd61c36..f1a1ffc0 100644 --- a/src/Spring/Spring.Data/Transaction/Support/DefaultTransactionStatus.cs +++ b/src/Spring/Spring.Data/Transaction/Support/DefaultTransactionStatus.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Transaction.Support; /// @@ -79,8 +75,6 @@ public class DefaultTransactionStatus : ITransactionStatus _suspendedResources = suspendedResources; } - #region Properties - /// /// Gets a value indicating whether the progress of this transaction is debugged. /// This is used by AbstractPlatformTransactionManager as an optimization, to prevent repeated @@ -192,10 +186,6 @@ public class DefaultTransactionStatus : ITransactionStatus get { return (Transaction is ISavepointManager); } } - #endregion - - #region ITransactionStatus Members - /// /// Returns true if the transaction is new, else false if participating /// in an existing transaction. @@ -240,8 +230,6 @@ public class DefaultTransactionStatus : ITransactionStatus _rollbackOnly = true; } - #endregion - /// /// Determine the rollback-only flag via checking this TransactionStatus. Will only /// return true if the application set the property RollbackOnly to true on this @@ -265,8 +253,6 @@ public class DefaultTransactionStatus : ITransactionStatus } } - #region ISavepointManager Members - /// /// This implementation delegates to the underlying transaction object /// (if it implements the interface) @@ -302,8 +288,6 @@ public class DefaultTransactionStatus : ITransactionStatus SavepointManager.ReleaseSavepoint(savepoint); } - #endregion - /// /// Create a savepoint and hold it for the transaction. /// diff --git a/src/Spring/Spring.Data/Transaction/Support/IResourceTransactionManager.cs b/src/Spring/Spring.Data/Transaction/Support/IResourceTransactionManager.cs index 5e330bae..706ad4af 100644 --- a/src/Spring/Spring.Data/Transaction/Support/IResourceTransactionManager.cs +++ b/src/Spring/Spring.Data/Transaction/Support/IResourceTransactionManager.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Transaction.Support; /// diff --git a/src/Spring/Spring.Data/Transaction/Support/ISmartTransactionObject.cs b/src/Spring/Spring.Data/Transaction/Support/ISmartTransactionObject.cs index 46cf4a01..013d1916 100644 --- a/src/Spring/Spring.Data/Transaction/Support/ISmartTransactionObject.cs +++ b/src/Spring/Spring.Data/Transaction/Support/ISmartTransactionObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Transaction.Support; /// diff --git a/src/Spring/Spring.Data/Transaction/Support/ITransactionCallback.cs b/src/Spring/Spring.Data/Transaction/Support/ITransactionCallback.cs index 12768e1e..040f1eea 100644 --- a/src/Spring/Spring.Data/Transaction/Support/ITransactionCallback.cs +++ b/src/Spring/Spring.Data/Transaction/Support/ITransactionCallback.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Transaction.Support; /// diff --git a/src/Spring/Spring.Data/Transaction/Support/ITransactionOperations.cs b/src/Spring/Spring.Data/Transaction/Support/ITransactionOperations.cs index 39e70df1..93486c37 100644 --- a/src/Spring/Spring.Data/Transaction/Support/ITransactionOperations.cs +++ b/src/Spring/Spring.Data/Transaction/Support/ITransactionOperations.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Transaction.Support; /// diff --git a/src/Spring/Spring.Data/Transaction/Support/ITransactionSynchronization.cs b/src/Spring/Spring.Data/Transaction/Support/ITransactionSynchronization.cs index 0b1398e6..be1c952c 100644 --- a/src/Spring/Spring.Data/Transaction/Support/ITransactionSynchronization.cs +++ b/src/Spring/Spring.Data/Transaction/Support/ITransactionSynchronization.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Transaction.Support; /// diff --git a/src/Spring/Spring.Data/Transaction/Support/ResourceHolderSupport.cs b/src/Spring/Spring.Data/Transaction/Support/ResourceHolderSupport.cs index 8ec4aed0..bc5e1397 100644 --- a/src/Spring/Spring.Data/Transaction/Support/ResourceHolderSupport.cs +++ b/src/Spring/Spring.Data/Transaction/Support/ResourceHolderSupport.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Transaction.Support; /// diff --git a/src/Spring/Spring.Data/Transaction/Support/TransactionCallbackWithoutResult.cs b/src/Spring/Spring.Data/Transaction/Support/TransactionCallbackWithoutResult.cs index 70fe01b8..a9d2006e 100644 --- a/src/Spring/Spring.Data/Transaction/Support/TransactionCallbackWithoutResult.cs +++ b/src/Spring/Spring.Data/Transaction/Support/TransactionCallbackWithoutResult.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Transaction.Support; /// @@ -28,8 +24,6 @@ namespace Spring.Transaction.Support; /// Mark Pollack (.NET) public abstract class TransactionCallbackWithoutResult : ITransactionCallback { - #region Methods - /// /// Gets called by TransactionTemplate.execute within a transactional context /// when no return value is required. @@ -45,10 +39,6 @@ public abstract class TransactionCallbackWithoutResult : ITransactionCallback /// public abstract void DoInTransactionWithoutResult(ITransactionStatus status); - #endregion - - #region ITransactionCallback Members - /// /// Gets called by TransactionTemplate.Execute within a /// transaction context. @@ -60,6 +50,4 @@ public abstract class TransactionCallbackWithoutResult : ITransactionCallback DoInTransactionWithoutResult(status); return null; } - - #endregion } diff --git a/src/Spring/Spring.Data/Transaction/Support/TransactionDelegate.cs b/src/Spring/Spring.Data/Transaction/Support/TransactionDelegate.cs index 3f63db28..1ba53bd9 100644 --- a/src/Spring/Spring.Data/Transaction/Support/TransactionDelegate.cs +++ b/src/Spring/Spring.Data/Transaction/Support/TransactionDelegate.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Transaction.Support; /// diff --git a/src/Spring/Spring.Data/Transaction/Support/TransactionSynchronizationAdapter.cs b/src/Spring/Spring.Data/Transaction/Support/TransactionSynchronizationAdapter.cs index ed5f4a65..7e0182e7 100644 --- a/src/Spring/Spring.Data/Transaction/Support/TransactionSynchronizationAdapter.cs +++ b/src/Spring/Spring.Data/Transaction/Support/TransactionSynchronizationAdapter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Transaction.Support; /// @@ -33,8 +29,6 @@ namespace Spring.Transaction.Support; /// Mark Pollack (.NET) public abstract class TransactionSynchronizationAdapter : ITransactionSynchronization, IComparable { - #region ITransactionSynchronization Members - /// /// Suspend this synchronization. /// @@ -122,8 +116,6 @@ public abstract class TransactionSynchronizationAdapter : ITransactionSynchroniz /// public virtual void AfterCompletion(TransactionSynchronizationStatus status) { } - #endregion - /// ///Compares the current instance with another object of the same type. /// diff --git a/src/Spring/Spring.Data/Transaction/Support/TransactionSynchronizationManager.cs b/src/Spring/Spring.Data/Transaction/Support/TransactionSynchronizationManager.cs index 9d1ac987..a484f78d 100644 --- a/src/Spring/Spring.Data/Transaction/Support/TransactionSynchronizationManager.cs +++ b/src/Spring/Spring.Data/Transaction/Support/TransactionSynchronizationManager.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Data; using Microsoft.Extensions.Logging; @@ -65,14 +61,8 @@ namespace Spring.Transaction.Support; /// Mark Pollack (.NET) public sealed class TransactionSynchronizationManager { - #region Logging - private static readonly ILogger LOG = LogManager.GetLogger(typeof(TransactionSynchronizationManager)); - #endregion - - #region Fields - private static readonly string syncsDataSlotName = "Spring.Transactions:syncList"; private static readonly string resourcesDataSlotName = "Spring.Transactions:resources"; @@ -87,10 +77,6 @@ public sealed class TransactionSynchronizationManager private static IComparer syncComparer = new OrderComparator(); - #endregion - - #region Management of transaction-associated resource handles - /// /// Return all resources that are bound to the current thread. /// @@ -223,8 +209,6 @@ public sealed class TransactionSynchronizationManager return val; } - #endregion - /// /// Activate transaction synchronization for the current thread. /// @@ -320,8 +304,6 @@ public sealed class TransactionSynchronizationManager return obj == null ? "" : obj + "@" + obj.GetHashCode().ToString("X"); } - #region Properties - /// /// Return an unmodifiable list of all registered synchronizations /// for the current thread. @@ -498,6 +480,4 @@ public sealed class TransactionSynchronizationManager LogicalThreadContext.SetData(currentTxIsolationLevelDataSlotName, value); } } - - #endregion } diff --git a/src/Spring/Spring.Data/Transaction/Support/TransactionSynchronizationState.cs b/src/Spring/Spring.Data/Transaction/Support/TransactionSynchronizationState.cs index 7d851201..70b49100 100644 --- a/src/Spring/Spring.Data/Transaction/Support/TransactionSynchronizationState.cs +++ b/src/Spring/Spring.Data/Transaction/Support/TransactionSynchronizationState.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Transaction.Support; /// diff --git a/src/Spring/Spring.Data/Transaction/Support/TransactionSynchronizationStatus.cs b/src/Spring/Spring.Data/Transaction/Support/TransactionSynchronizationStatus.cs index 19180546..383a6a22 100644 --- a/src/Spring/Spring.Data/Transaction/Support/TransactionSynchronizationStatus.cs +++ b/src/Spring/Spring.Data/Transaction/Support/TransactionSynchronizationStatus.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Transaction.Support; /// diff --git a/src/Spring/Spring.Data/Transaction/Support/TransactionTemplate.cs b/src/Spring/Spring.Data/Transaction/Support/TransactionTemplate.cs index 70a7df0b..4a055b65 100644 --- a/src/Spring/Spring.Data/Transaction/Support/TransactionTemplate.cs +++ b/src/Spring/Spring.Data/Transaction/Support/TransactionTemplate.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using Spring.Objects.Factory; @@ -58,12 +54,8 @@ public class TransactionTemplate : DefaultTransactionDefinition, ITransactionOpe { private IPlatformTransactionManager _platformTransactionManager; - #region Logging Definition - protected readonly ILogger log = LogManager.GetLogger(); - #endregion - /// /// Creates a new instance of the /// class. @@ -111,8 +103,6 @@ public class TransactionTemplate : DefaultTransactionDefinition, ITransactionOpe set { _platformTransactionManager = value; } } - #region IInitializingObject Members - /// /// Ensures that the /// @@ -126,8 +116,6 @@ public class TransactionTemplate : DefaultTransactionDefinition, ITransactionOpe } } - #endregion - /// /// Executes the the action specified by the given delegate callback within a transaction. /// diff --git a/src/Spring/Spring.Data/Transaction/TransactionException.cs b/src/Spring/Spring.Data/Transaction/TransactionException.cs index 4302a24a..b41c3eed 100644 --- a/src/Spring/Spring.Data/Transaction/TransactionException.cs +++ b/src/Spring/Spring.Data/Transaction/TransactionException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Transaction; diff --git a/src/Spring/Spring.Data/Transaction/TransactionOutcomeState.cs b/src/Spring/Spring.Data/Transaction/TransactionOutcomeState.cs index d843c92c..8cf573b0 100644 --- a/src/Spring/Spring.Data/Transaction/TransactionOutcomeState.cs +++ b/src/Spring/Spring.Data/Transaction/TransactionOutcomeState.cs @@ -1,7 +1,3 @@ -#region License - -#endregion - namespace Spring.Transaction; /// diff --git a/src/Spring/Spring.Data/Transaction/TransactionPropagation.cs b/src/Spring/Spring.Data/Transaction/TransactionPropagation.cs index 533e49d8..0dd3f4f6 100644 --- a/src/Spring/Spring.Data/Transaction/TransactionPropagation.cs +++ b/src/Spring/Spring.Data/Transaction/TransactionPropagation.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Transaction; /// diff --git a/src/Spring/Spring.Data/Transaction/TransactionSuspensionNotSupportedException.cs b/src/Spring/Spring.Data/Transaction/TransactionSuspensionNotSupportedException.cs index 5ec8cac1..502ed81a 100644 --- a/src/Spring/Spring.Data/Transaction/TransactionSuspensionNotSupportedException.cs +++ b/src/Spring/Spring.Data/Transaction/TransactionSuspensionNotSupportedException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Transaction; diff --git a/src/Spring/Spring.Data/Transaction/TransactionSystemException.cs b/src/Spring/Spring.Data/Transaction/TransactionSystemException.cs index 567d08a0..ae510a7b 100644 --- a/src/Spring/Spring.Data/Transaction/TransactionSystemException.cs +++ b/src/Spring/Spring.Data/Transaction/TransactionSystemException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Transaction; diff --git a/src/Spring/Spring.Data/Transaction/TransactionUsageException.cs b/src/Spring/Spring.Data/Transaction/TransactionUsageException.cs index d8b417dc..9aec7aa1 100644 --- a/src/Spring/Spring.Data/Transaction/TransactionUsageException.cs +++ b/src/Spring/Spring.Data/Transaction/TransactionUsageException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Transaction; diff --git a/src/Spring/Spring.Data/Transaction/UnexpectedRollbackException.cs b/src/Spring/Spring.Data/Transaction/UnexpectedRollbackException.cs index 857dcb43..152f40a9 100644 --- a/src/Spring/Spring.Data/Transaction/UnexpectedRollbackException.cs +++ b/src/Spring/Spring.Data/Transaction/UnexpectedRollbackException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Transaction; diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsConnection.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsConnection.cs index bb7f108c..87d2e2fe 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsConnection.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsConnection.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; namespace Spring.Messaging.Ems.Common; @@ -27,12 +23,8 @@ namespace Spring.Messaging.Ems.Common; /// public class EmsConnection : IConnection { - #region Logging - private readonly ILogger logger = LogManager.GetLogger(); - #endregion - private Connection nativeConnection; /// @@ -45,8 +37,6 @@ public class EmsConnection : IConnection this.nativeConnection.ExceptionHandler += HandleEmsException; } - #region Implementation of IConnection - /// /// Gets the native TIBCO EMS connection. /// @@ -184,8 +174,6 @@ public class EmsConnection : IConnection nativeConnection.Stop(); } - #endregion - private void HandleEmsException(object sender, EMSExceptionEventArgs arg) { if (EMSExceptionHandler != null) diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsConnectionFactory.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsConnectionFactory.cs index 51740213..f1a4148e 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsConnectionFactory.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsConnectionFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Runtime.Serialization; using Spring.Objects.Factory; @@ -56,26 +52,16 @@ public class EmsConnectionFactory : IConnectionFactory, IInitializingObject this.nativeConnectionFactory = nativeConnectionFactory; } - #region Implementation of ISerializable - public void GetObjectData(SerializationInfo info, StreamingContext context) { nativeConnectionFactory.GetObjectData(info, context); } - #endregion - - #region Implementation of ICloneable - public object Clone() { return nativeConnectionFactory.Clone(); } - #endregion - - #region Implementation of IConnectionFactory - public ConnectionFactory NativeConnectionFactory { get { return this.nativeConnectionFactory; } @@ -255,10 +241,6 @@ public class EmsConnectionFactory : IConnectionFactory, IInitializingObject } } - #endregion - - #region Implementation of IInitializingObject - public void AfterPropertiesSet() { if (this.sslProxyAuthUsername != null && sslProxyAuthPassword != null) @@ -271,6 +253,4 @@ public class EmsConnectionFactory : IConnectionFactory, IInitializingObject nativeConnectionFactory.SetSSLProxy(this.sslProxyHost, this.sslProxyPort); } } - - #endregion } diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsMessageConsumer.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsMessageConsumer.cs index c86bd5aa..bcbd6482 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsMessageConsumer.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsMessageConsumer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Messaging.Ems.Common; public class EmsMessageConsumer : IMessageConsumer @@ -30,8 +26,6 @@ public class EmsMessageConsumer : IMessageConsumer nativeMessageConsumer.MessageHandler += MessageHandler; } - #region Implementation of IMessageConsumer - public MessageConsumer NativeMessageConsumer { get { return this.nativeMessageConsumer; } @@ -69,6 +63,4 @@ public class EmsMessageConsumer : IMessageConsumer { return nativeMessageConsumer.ReceiveNoWait(); } - - #endregion } diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsMessageProducer.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsMessageProducer.cs index 2f08054f..9c7c45b1 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsMessageProducer.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsMessageProducer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Messaging.Ems.Common; public class EmsMessageProducer : IMessageProducer @@ -29,8 +25,6 @@ public class EmsMessageProducer : IMessageProducer this.nativeMessageProducer = messageProducer; } - #region Implementation of IMessageProducer - public MessageProducer NativeMessageProducer { get { return this.nativeMessageProducer; } @@ -111,6 +105,4 @@ public class EmsMessageProducer : IMessageProducer get { return nativeMessageProducer.TimeToLive; } set { nativeMessageProducer.TimeToLive = value; } } - - #endregion } diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsSSLFileStoreInfo.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsSSLFileStoreInfo.cs index b0b75c6b..4b270357 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsSSLFileStoreInfo.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsSSLFileStoreInfo.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Security.Cryptography.X509Certificates; namespace Spring.Messaging.Ems.Common; diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsSSLSystemStoreInfo.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsSSLSystemStoreInfo.cs index 205df886..a4502e61 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsSSLSystemStoreInfo.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsSSLSystemStoreInfo.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Security.Cryptography.X509Certificates; namespace Spring.Messaging.Ems.Common; diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsSession.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsSession.cs index 02ad668b..d46ad688 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsSession.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsSession.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Messaging.Ems.Common; public class EmsSession : ISession @@ -29,8 +25,6 @@ public class EmsSession : ISession this.nativeSession = session; } - #region Implementation of ISession - public Session NativeSession { get { return this.nativeSession; } @@ -201,6 +195,4 @@ public class EmsSession : ISession { get { return nativeSession.Transacted; } } - - #endregion } \ No newline at end of file diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsTopicSubscriber.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsTopicSubscriber.cs index 0902dcb2..643fbfe7 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsTopicSubscriber.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsTopicSubscriber.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Messaging.Ems.Common; public class EmsTopicSubscriber : EmsMessageConsumer, ITopicSubscriber @@ -27,8 +23,6 @@ public class EmsTopicSubscriber : EmsMessageConsumer, ITopicSubscriber { } - #region Implementation of ITopicSubscriber - public bool NoLocal { get { return ((TopicSubscriber) nativeMessageConsumer).NoLocal; } @@ -38,6 +32,4 @@ public class EmsTopicSubscriber : EmsMessageConsumer, ITopicSubscriber { get { return ((TopicSubscriber) nativeMessageConsumer).Topic; } } - - #endregion } diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/IConnection.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/IConnection.cs index 9f6d4c4b..0863a4d1 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/IConnection.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/IConnection.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.ComponentModel; namespace Spring.Messaging.Ems.Common; diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/IConnectionFactory.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/IConnectionFactory.cs index 6a596e63..e8010d1d 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/IConnectionFactory.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/IConnectionFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Messaging.Ems.Common; diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/IEmsSSLStoreType.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/IEmsSSLStoreType.cs index 46fa2c08..016c6d1c 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/IEmsSSLStoreType.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/IEmsSSLStoreType.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Messaging.Ems.Common; /// diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/IMessageConsumer.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/IMessageConsumer.cs index dd5d8310..ea5f77e6 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/IMessageConsumer.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/IMessageConsumer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Messaging.Ems.Common; public interface IMessageConsumer diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/IMessageProducer.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/IMessageProducer.cs index 56206121..b9ca4358 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/IMessageProducer.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/IMessageProducer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Messaging.Ems.Common; public interface IMessageProducer diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/ISession.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/ISession.cs index 795237cf..09a4f3b7 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/ISession.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/ISession.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.ComponentModel; namespace Spring.Messaging.Ems.Common; diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/ITopicSubscriber.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/ITopicSubscriber.cs index 716f91a9..0a810770 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/ITopicSubscriber.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/ITopicSubscriber.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Messaging.Ems.Common; public interface ITopicSubscriber : IMessageConsumer diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Config/EmsNamespaceParser.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Config/EmsNamespaceParser.cs index 58a95f7f..2ae0cf54 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Config/EmsNamespaceParser.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Config/EmsNamespaceParser.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects.Factory.Xml; namespace Spring.Messaging.Ems.Config; diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Config/MessageListenerContainerObjectDefinitionParser.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Config/MessageListenerContainerObjectDefinitionParser.cs index 6d3a0ce8..6f8e025b 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Config/MessageListenerContainerObjectDefinitionParser.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Config/MessageListenerContainerObjectDefinitionParser.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Xml; using Spring.Core.TypeResolution; //using TIBCO.EMS; @@ -38,8 +34,6 @@ namespace Spring.Messaging.Ems.Config; /// Mark Pollack (.NET) public class MessageListenerContainerObjectDefinitionParser : IObjectDefinitionParser { - #region Fields - private readonly string LISTENER_ELEMENT = "listener"; private readonly string ID_ATTRIBUTE = "id"; @@ -98,10 +92,6 @@ public class MessageListenerContainerObjectDefinitionParser : IObjectDefinitionP private readonly string EXCEPTION_LISTENER_ATTRIBUTE = "exception-listener"; - #endregion - - #region IObjectDefinitionParser Members - /// /// Parse the specified XmlElement and register the resulting /// ObjectDefinitions with the IObjectDefinitionRegistry @@ -135,8 +125,6 @@ public class MessageListenerContainerObjectDefinitionParser : IObjectDefinitionP return null; } - #endregion - private void ParseListener(XmlElement listenerElement, XmlElement containerElement, ParserContext parserContext) { ObjectDefinitionBuilder listenerDefBuilder = diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/CachedMessageConsumer .cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/CachedMessageConsumer .cs index d6357dc5..9383c362 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/CachedMessageConsumer .cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/CachedMessageConsumer .cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Messaging.Ems.Common; namespace Spring.Messaging.Ems.Connections; diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/CachedMessageProducer.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/CachedMessageProducer.cs index 21effaa5..6f68576e 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/CachedMessageProducer.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/CachedMessageProducer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Messaging.Ems.Common; namespace Spring.Messaging.Ems.Connections; diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/CachedSession.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/CachedSession.cs index da49aa17..8dd756d6 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/CachedSession.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/CachedSession.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Microsoft.Extensions.Logging; using Spring.Messaging.Ems.Common; @@ -37,12 +33,8 @@ namespace Spring.Messaging.Ems.Connections; /// Mark Pollack public class CachedSession : IDecoratorSession { - #region Logging Definition - private static readonly ILogger LOG = LogManager.GetLogger(); - #endregion - private readonly ISession target; private readonly LinkedList sessionList; private readonly int sessionCacheSize; @@ -90,28 +82,20 @@ public class CachedSession : IDecoratorSession IMessageProducer producer = (IMessageProducer) cachedProducers[destination]; if (producer != null) { - #region Logging - if (LOG.IsEnabled(LogLevel.Debug)) { LOG.LogDebug("Found cached MessageProducer for destination [" + destination + "]"); } - - #endregion } else { producer = target.CreateProducer(destination); - #region Logging - if (LOG.IsEnabled(LogLevel.Debug)) { LOG.LogDebug("Creating cached MessageProducer for destination [" + destination + "]"); } - #endregion - cachedProducers.Add(destination, producer); } @@ -177,15 +161,11 @@ public class CachedSession : IDecoratorSession // Allow for multiple close calls... if (!sessionList.Contains(this)) { - #region Logging - if (LOG.IsEnabled(LogLevel.Debug)) { LOG.LogDebug("Returning cached Session: " + target); } - #endregion - sessionList.Add(this); //add to end of linked list. } } @@ -339,8 +319,6 @@ public class CachedSession : IDecoratorSession return new CachedMessageConsumer(consumer); } - #region Pass through implementations - /// /// Gets the queue. /// @@ -593,8 +571,6 @@ public class CachedSession : IDecoratorSession } } - #endregion - /// /// Returns a that represents the current . /// diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/CachingConnectionFactory.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/CachingConnectionFactory.cs index 768bcfc9..6376cb19 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/CachingConnectionFactory.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/CachingConnectionFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Microsoft.Extensions.Logging; using Spring.Messaging.Ems.Common; @@ -57,12 +53,8 @@ namespace Spring.Messaging.Ems.Connections; /// Mark Pollack (.NET) public class CachingConnectionFactory : SingleConnectionFactory { - #region Logging Definition - private static readonly ILog LOG = LogManager.GetLogger(typeof(CachingConnectionFactory)); - #endregion - private int sessionCacheSize = 1; private bool cacheProducers = true; diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/ChainedExceptionListener.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/ChainedExceptionListener.cs index 32e066f8..44487159 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/ChainedExceptionListener.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/ChainedExceptionListener.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Spring.Util; diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/ConnectionFactoryUtils.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/ConnectionFactoryUtils.cs index fa187989..e5bec052 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/ConnectionFactoryUtils.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/ConnectionFactoryUtils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using Spring.Messaging.Ems.Common; using Spring.Messaging.Ems.Support; @@ -33,12 +29,8 @@ namespace Spring.Messaging.Ems.Connections; /// Mark Pollack (.NET) public abstract class ConnectionFactoryUtils { - #region Logging - private static readonly ILogger LOG = LogManager.GetLogger(); - #endregion - /// /// Releases the given connection, stopping it (if necessary) and eventually closing it. /// @@ -249,8 +241,6 @@ public abstract class ConnectionFactoryUtils return session; } - #region ResourceFactory helper classes - private class AnonymousClassResourceFactory : ResourceFactory { private IConnection existingCon; @@ -296,10 +286,6 @@ public abstract class ConnectionFactoryUtils } } - #endregion - - #region Helper classes/interfaces - /// Callback interface for resource creation. /// Serving as argument for the DoGetTransactionalSession method. /// @@ -414,6 +400,4 @@ public abstract class ConnectionFactoryUtils } } } - - #endregion } diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/EmsResourceHolder.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/EmsResourceHolder.cs index 4c42ba99..e1893a0c 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/EmsResourceHolder.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/EmsResourceHolder.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Microsoft.Extensions.Logging; using Spring.Collections; @@ -38,14 +34,8 @@ namespace Spring.Messaging.Ems.Connections; /// Mark Pollack (.NET) public class EmsResourceHolder : ResourceHolderSupport { - #region Logging - private static readonly ILogger logger = LogManager.GetLogger(); - #endregion - - #region Fields - private IConnectionFactory connectionFactory; private bool frozen = false; @@ -56,10 +46,6 @@ public class EmsResourceHolder : ResourceHolderSupport private IDictionary sessionsPerConnection = new Hashtable(); - #endregion - - #region Constructor (s) - /// Create a new EmsResourceHolder that is open for resources to be added. public EmsResourceHolder() { @@ -114,10 +100,6 @@ public class EmsResourceHolder : ResourceHolderSupport this.frozen = true; } - #endregion - - #region Properties - /// /// Gets a value indicating whether this is frozen, namely that /// additional resources can be registered with the holder. If using any of the constructors with @@ -132,10 +114,6 @@ public class EmsResourceHolder : ResourceHolderSupport } } - #endregion - - #region Methods - /// /// Adds the connection to the list of resources managed by this holder. /// @@ -291,6 +269,4 @@ public class EmsResourceHolder : ResourceHolderSupport { return this.sessions.Contains(session); } - - #endregion } \ No newline at end of file diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/EmsTransactionManager.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/EmsTransactionManager.cs index a2216859..fa76fdc8 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/EmsTransactionManager.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/EmsTransactionManager.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; using Microsoft.Extensions.Logging; using Spring.Messaging.Ems.Common; @@ -52,12 +48,8 @@ namespace Spring.Messaging.Ems.Connections; public class EmsTransactionManager : AbstractPlatformTransactionManager, IResourceTransactionManager, IInitializingObject { - #region Logging Definition - private static readonly ILogger LOG = LogManager.GetLogger(); - #endregion - private IConnectionFactory connectionFactory; /// @@ -104,8 +96,6 @@ public class EmsTransactionManager : AbstractPlatformTransactionManager, } } - #region IInitializingObject Members - /// /// Make sure the ConnectionFactory has been set. /// @@ -117,10 +107,6 @@ public class EmsTransactionManager : AbstractPlatformTransactionManager, } } - #endregion - - #region IResourceTransactionManager Members - /// /// Gets the resource factory that this transaction manager operates on, /// In tihs case the ConnectionFactory @@ -131,8 +117,6 @@ public class EmsTransactionManager : AbstractPlatformTransactionManager, get { return ConnectionFactory; } } - #endregion - /// /// Get the EmsTransactionObject. /// @@ -405,13 +389,9 @@ public class EmsTransactionManager : AbstractPlatformTransactionManager, set { resourceHolder = value; } } - #region ISmartTransactionObject Members - public bool RollbackOnly { get { return resourceHolder.RollbackOnly; } } - - #endregion } } \ No newline at end of file diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/IDecoratorSession.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/IDecoratorSession.cs index c35d6f45..a657830d 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/IDecoratorSession.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/IDecoratorSession.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Messaging.Ems.Common; namespace Spring.Messaging.Ems.Connections; diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/ISmartConnectionFactory.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/ISmartConnectionFactory.cs index b2fdae84..91c6d8a6 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/ISmartConnectionFactory.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/ISmartConnectionFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Messaging.Ems.Common; namespace Spring.Messaging.Ems.Connections; diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/SingleConnectionFactory.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/SingleConnectionFactory.cs index 030aa7d6..824058c3 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/SingleConnectionFactory.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/SingleConnectionFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using Microsoft.Extensions.Logging; using Spring.Messaging.Ems.Support; @@ -58,14 +54,8 @@ namespace Spring.Messaging.Ems.Connections; /// Mark Pollack (.NET) public class SingleConnectionFactory : IConnectionFactory, IExceptionListener, IInitializingObject, IDisposable { - #region Logging Definition - private static readonly ILog LOG = LogManager.GetLogger(typeof(SingleConnectionFactory)); - #endregion - - #region Fields - private IConnectionFactory targetConnectionFactory; private string clientId; @@ -99,10 +89,6 @@ public class SingleConnectionFactory : IConnectionFactory, IExceptionListener, I private bool sslProxyAuthPasswordSet; private bool sslProxyAuthUsernameSet; - #endregion - - #region Constructors - /// /// Initializes a new instance of the class. /// @@ -134,10 +120,6 @@ public class SingleConnectionFactory : IConnectionFactory, IExceptionListener, I this.targetConnectionFactory = targetConnectionFactory; } - #endregion - - #region Properties - /// /// Gets or sets the target connection factory which will be used to create a single /// connection. @@ -214,10 +196,6 @@ public class SingleConnectionFactory : IConnectionFactory, IExceptionListener, I get { return clientId; } } - #endregion - - #region Implementation of IConnectionFactory - /// /// Creates the connection. /// @@ -414,26 +392,16 @@ public class SingleConnectionFactory : IConnectionFactory, IExceptionListener, I set { TargetConnectionFactory.Metric = value; } } - #endregion - - #region Implementation of ISerializable - public void GetObjectData(SerializationInfo info, StreamingContext context) { TargetConnectionFactory.GetObjectData(info, context); } - #endregion - - #region Implementation of ICloneable - public object Clone() { return TargetConnectionFactory.Clone(); } - #endregion - /// /// Initialize the underlying shared Connection. Closes and reinitializes the Connection if an underlying /// Connection is present already. @@ -552,8 +520,6 @@ public class SingleConnectionFactory : IConnectionFactory, IExceptionListener, I } } - #region IInitializingObject Members - /// /// Ensure that the connection or TargetConnectionFactory are specified. /// @@ -577,8 +543,6 @@ public class SingleConnectionFactory : IConnectionFactory, IExceptionListener, I } } - #endregion - /// /// Close the underlying shared connection. The provider of this ConnectionFactory needs to care for proper shutdown. /// As this object implements an application context will automatically @@ -762,8 +726,6 @@ internal class CloseSupressingConnection : IConnection } } - #region Pass through implementations to the target connection - public event EMSExceptionHandler EMSExceptionHandler { add @@ -805,6 +767,4 @@ internal class CloseSupressingConnection : IConnection { get { return target.MetaData; } } - - #endregion } diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/SynchedLocalTransactionFailedException.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/SynchedLocalTransactionFailedException.cs index 74397bf4..81186ec3 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/SynchedLocalTransactionFailedException.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/SynchedLocalTransactionFailedException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Messaging.Ems.Connections; /// Exception thrown when a synchronized local transaction failed to complete @@ -28,8 +24,6 @@ namespace Spring.Messaging.Ems.Connections; [Serializable] public class SynchedLocalTransactionFailedException : EMSException { - #region Constructor (s) / Destructor - /// /// Creates a new instance of the SynchedLocalTransactionFailedException class. with the specified message. /// @@ -55,6 +49,4 @@ public class SynchedLocalTransactionFailedException : EMSException { LinkedException = rootCause; } - - #endregion } diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/BrowserDelegate.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/BrowserDelegate.cs index 4d931b7e..fdb1500f 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/BrowserDelegate.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/BrowserDelegate.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Messaging.Ems.Common; namespace Spring.Messaging.Ems.Core; diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/EmsGatewaySupport.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/EmsGatewaySupport.cs index 2d11a8be..28e81521 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/EmsGatewaySupport.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/EmsGatewaySupport.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Messaging.Ems.Common; using Spring.Objects.Factory; @@ -35,12 +31,8 @@ namespace Spring.Messaging.Ems.Core; /// public class EmsGatewaySupport : IInitializingObject { - #region Logging - private readonly ILogger logger = LogManager.GetLogger(); - #endregion - private EmsTemplate emsTemplate; /// diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/EmsTemplate.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/EmsTemplate.cs index 277e3068..3ae7124e 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/EmsTemplate.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/EmsTemplate.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using Spring.Messaging.Ems.Common; using Spring.Messaging.Ems.Connections; @@ -49,14 +45,8 @@ namespace Spring.Messaging.Ems.Core; /// Mark Pollack (.NET) public class EmsTemplate : EmsDestinationAccessor, IEmsOperations { - #region Logging - private readonly ILogger logger = LogManager.GetLogger(); - #endregion - - #region Fields - /// /// Timeout value indicating that a receive operation should /// check if a message is immediately available without blocking. @@ -85,10 +75,6 @@ public class EmsTemplate : EmsDestinationAccessor, IEmsOperations private long timeToLive = Message.DEFAULT_TIME_TO_LIVE; - #endregion - - #region Constructor (s) - /// Create a new EmsTemplate. /// /// Note: The ConnectionFactory has to be set before using the instance. @@ -111,10 +97,6 @@ public class EmsTemplate : EmsDestinationAccessor, IEmsOperations AfterPropertiesSet(); } - #endregion - - #region Methods - /// Initialize the default implementations for the template's strategies: /// DynamicDestinationResolver and SimpleMessageConverter. /// @@ -225,10 +207,6 @@ public class EmsTemplate : EmsDestinationAccessor, IEmsOperations } } - #endregion - - #region Properties - /// /// Gets or sets the default destination to be used on send/receive operations that do not /// have a destination parameter. @@ -396,8 +374,6 @@ public class EmsTemplate : EmsDestinationAccessor, IEmsOperations set { cacheEmsResources = value; } }*/ - #endregion - /// /// Extract the content from the given JMS message. /// @@ -413,8 +389,6 @@ public class EmsTemplate : EmsDestinationAccessor, IEmsOperations return null; } - #region EMS Factory Methods - /// Fetch an appropriate Connection from the given EmsResourceHolder. /// /// the EmsResourceHolder @@ -721,10 +695,6 @@ public class EmsTemplate : EmsDestinationAccessor, IEmsOperations } } - #endregion - - #region IEmsOperations Implementation - /// /// Execute the action specified by the given action object within /// a EMS Session. @@ -1539,8 +1509,6 @@ public class EmsTemplate : EmsDestinationAccessor, IEmsOperations }, true); } - #endregion - /// /// Creates the queue browser. /// @@ -1553,8 +1521,6 @@ public class EmsTemplate : EmsDestinationAccessor, IEmsOperations return session.CreateBrowser(queue, selector); } - #region Supporting Internal Classes - /// /// ResourceFactory implementation that delegates to this template's callback methods. /// @@ -1764,8 +1730,6 @@ public class EmsTemplate : EmsDestinationAccessor, IEmsOperations return del(session); } } - - #endregion } /// diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/IBrowserCallback.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/IBrowserCallback.cs index 2195648b..c9ab7054 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/IBrowserCallback.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/IBrowserCallback.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Messaging.Ems.Common; namespace Spring.Messaging.Ems.Core; diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/IEmsOperations.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/IEmsOperations.cs index 30bfd337..a4a46a94 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/IEmsOperations.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/IEmsOperations.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Messaging.Ems.Core; /// Specifies a basic set of EMS operations. diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/IMessageCreator.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/IMessageCreator.cs index 1cd62697..2ea74cb8 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/IMessageCreator.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/IMessageCreator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Messaging.Ems.Common; namespace Spring.Messaging.Ems.Core; diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/IMessagePostProcessor.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/IMessagePostProcessor.cs index 848991c0..be584ff9 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/IMessagePostProcessor.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/IMessagePostProcessor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Messaging.Ems.Core; /// To be used with EmsTemplate's send method that diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/IProducerCallback.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/IProducerCallback.cs index efa14ee1..f9e0ab4f 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/IProducerCallback.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/IProducerCallback.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Messaging.Ems.Common; namespace Spring.Messaging.Ems.Core; diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/ISessionCallback.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/ISessionCallback.cs index 0554136d..ae573fb0 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/ISessionCallback.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/ISessionCallback.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Messaging.Ems.Common; namespace Spring.Messaging.Ems.Core; diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/MessageCreatorDelegate.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/MessageCreatorDelegate.cs index 7d2a994c..7ad99e99 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/MessageCreatorDelegate.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/MessageCreatorDelegate.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Messaging.Ems.Common; namespace Spring.Messaging.Ems.Core; diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/MessagePostProcessorDelegate.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/MessagePostProcessorDelegate.cs index 4d3aec8d..e0009186 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/MessagePostProcessorDelegate.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/MessagePostProcessorDelegate.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Messaging.Ems.Core; /// diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/ProducerDelegate.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/ProducerDelegate.cs index fdc9015f..97fc3ad9 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/ProducerDelegate.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/ProducerDelegate.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Messaging.Ems.Common; namespace Spring.Messaging.Ems.Core; diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/SessionDelegate.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/SessionDelegate.cs index 173c7a7d..c4b04def 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/SessionDelegate.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/SessionDelegate.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Messaging.Ems.Common; namespace Spring.Messaging.Ems.Core; diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Jndi/JndiAccessor.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Jndi/JndiAccessor.cs index 1cd7b6a6..5b6f8046 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Jndi/JndiAccessor.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Jndi/JndiAccessor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Spring.Objects.Factory; diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Jndi/JndiLocatorSupport.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Jndi/JndiLocatorSupport.cs index 05ac7ee9..dc276730 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Jndi/JndiLocatorSupport.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Jndi/JndiLocatorSupport.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using Spring.Objects.Factory; using Spring.Util; diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Jndi/JndiLookupFactoryObject.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Jndi/JndiLookupFactoryObject.cs index a5cbdd7f..5f7e968f 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Jndi/JndiLookupFactoryObject.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Jndi/JndiLookupFactoryObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using Spring.Core.TypeResolution; using Spring.Objects.Factory; @@ -59,8 +55,6 @@ public class JndiLookupFactoryObject : JndiObjectLocator, IConfigurableFactoryOb set { defaultObject = value; } } - #region Implementation of IFactoryObject - /// /// Return the Jndi object /// @@ -96,8 +90,6 @@ public class JndiLookupFactoryObject : JndiObjectLocator, IConfigurableFactoryOb get { return true; } } - #endregion - public override void AfterPropertiesSet() { base.AfterPropertiesSet(); diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Jndi/JndiObjectLocator.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Jndi/JndiObjectLocator.cs index c941488b..bcf0adb4 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Jndi/JndiObjectLocator.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Jndi/JndiObjectLocator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Util; namespace Spring.Messaging.Ems.Jndi; @@ -65,8 +61,6 @@ public abstract class JndiObjectLocator : JndiLocatorSupport set { expectedType = value; } } - #region Implementation of IInitializingObject - /// /// Ensure that the JndiName property is set and create the TIBCO EMS ILookupContext instance. /// @@ -87,6 +81,4 @@ public abstract class JndiObjectLocator : JndiLocatorSupport { return Lookup(JndiName, ExpectedType); } - - #endregion } \ No newline at end of file diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Jndi/LookupContextFactoryObject.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Jndi/LookupContextFactoryObject.cs index f3c92022..51cb99e1 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Jndi/LookupContextFactoryObject.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Jndi/LookupContextFactoryObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects.Factory; namespace Spring.Messaging.Ems.Jndi; @@ -38,8 +34,6 @@ namespace Spring.Messaging.Ems.Jndi; /// Mark Pollack public class LookupContextFactoryObject : JndiLocatorSupport, IFactoryObject { - #region Implementation of IFactoryObject - /// /// Returns the TIBCO.EMS.ILookupContext /// @@ -64,6 +58,4 @@ public class LookupContextFactoryObject : JndiLocatorSupport, IFactoryObject { get { return true; } } - - #endregion } diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Jndi/TypeMismatchNamingException.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Jndi/TypeMismatchNamingException.cs index 93553d06..651cd171 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Jndi/TypeMismatchNamingException.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Jndi/TypeMismatchNamingException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory; /// diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/AbstractListenerContainer.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/AbstractListenerContainer.cs index 8438c8e5..3d34a85e 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/AbstractListenerContainer.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/AbstractListenerContainer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using Spring.Context; using Spring.Messaging.Ems.Common; @@ -46,14 +42,8 @@ namespace Spring.Messaging.Ems.Listener; /// Mark Pollack public abstract class AbstractListenerContainer : EmsDestinationAccessor, ILifecycle, IObjectNameAware, IDisposable { - #region Logging - private readonly ILogger logger = LogManager.GetLogger(); - #endregion - - #region Fields - private String clientId; private bool autoStartup = true; @@ -78,8 +68,6 @@ public abstract class AbstractListenerContainer : EmsDestinationAccessor, ILifec /// protected object lifecycleMonitor = new object(); - #endregion - /// /// Gets or sets the client id for a shared Connection created and used by this container. /// diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/AbstractMessageListenerContainer.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/AbstractMessageListenerContainer.cs index 11f0c7cf..71f898d1 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/AbstractMessageListenerContainer.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/AbstractMessageListenerContainer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using Spring.Messaging.Ems.Common; using Spring.Messaging.Ems.Core; @@ -33,14 +29,8 @@ namespace Spring.Messaging.Ems.Listener; /// public abstract class AbstractMessageListenerContainer : AbstractListenerContainer { - #region Logging - private readonly ILogger logger = LogManager.GetLogger(); - #endregion - - #region Fields - private object destination; private String messageSelector; @@ -59,10 +49,6 @@ public abstract class AbstractMessageListenerContainer : AbstractListenerContain private bool acceptMessagesWhileStopping = false; - #endregion - - #region Properties - /// /// Gets or sets the destination to receive messages from. Will be null /// if the configured destination is not an actual Destination type; @@ -264,8 +250,6 @@ public abstract class AbstractMessageListenerContainer : AbstractListenerContain set { acceptMessagesWhileStopping = value; } } - #endregion - /// /// Validate that the destination is not null and that if the subscription is durable, then we are not /// using the Pub/Sub domain. @@ -283,8 +267,6 @@ public abstract class AbstractMessageListenerContainer : AbstractListenerContain } } - #region Template methods for listeners - /// /// Executes the specified listener, /// committing or rolling back the transaction afterwards (if necessary). @@ -321,16 +303,12 @@ public abstract class AbstractMessageListenerContainer : AbstractListenerContain { if (!AcceptMessagesWhileStopping && !IsRunning) { - #region Logging - if (logger.IsEnabled(LogLevel.Warning)) { logger.LogWarning("Rejecting received message because of the listener container " + "having been stopped in the meantime: " + message); } - #endregion - RollbackIfNecessary(session); throw new MessageRejectedWhileStoppingException(); } @@ -598,8 +576,6 @@ public abstract class AbstractMessageListenerContainer : AbstractListenerContain } } - #endregion - /// /// Checks the message listener, throwing an exception /// if it does not correspond to a supported listener type. diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/Adapter/ListenerExecutionFailedException.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/Adapter/ListenerExecutionFailedException.cs index 09f02396..08c37736 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/Adapter/ListenerExecutionFailedException.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/Adapter/ListenerExecutionFailedException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Messaging.Ems.Listener.Adapter; /// diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/Adapter/MessageListenerAdapter.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/Adapter/MessageListenerAdapter.cs index da830ed0..da296c15 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/Adapter/MessageListenerAdapter.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/Adapter/MessageListenerAdapter.cs @@ -45,19 +45,13 @@ namespace Spring.Messaging.Ems.Listener.Adapter; /// Mark Pollack (.NET) public class MessageListenerAdapter : IMessageListener, ISessionAwareMessageListener { - #region Logging - private readonly ILog logger = LogManager.GetLogger(typeof(MessageListenerAdapter)); - #endregion - /// /// The default handler method name. /// public static string ORIGINAL_DEFAULT_HANDLER_METHOD = "HandleMessage"; - #region Fields - private object handlerObject; private string defaultHandlerMethod = ORIGINAL_DEFAULT_HANDLER_METHOD; @@ -70,10 +64,6 @@ public class MessageListenerAdapter : IMessageListener, ISessionAwareMessageList private IMessageConverter messageConverter; - #endregion - - #region Constructors - /// /// Initializes a new instance of the class with default settings. /// @@ -93,10 +83,6 @@ public class MessageListenerAdapter : IMessageListener, ISessionAwareMessageList this.handlerObject = handlerObject; } - #endregion - - #region Properties - /// /// Gets or sets the handler object to delegate message listening to. /// @@ -204,8 +190,6 @@ public class MessageListenerAdapter : IMessageListener, ISessionAwareMessageList set { messageConverter = value; } } - #endregion - /// /// Standard JMS {@link MessageListener} entry point. /// Delegates the message to the target listener method, with appropriate diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/ISessionAwareMessageListener.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/ISessionAwareMessageListener.cs index 059dbc31..a5732495 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/ISessionAwareMessageListener.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/ISessionAwareMessageListener.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Messaging.Ems.Common; namespace Spring.Messaging.Ems.Listener; diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/LocallyExposedEmsResourceHolder.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/LocallyExposedEmsResourceHolder.cs index ac471ffe..4617d269 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/LocallyExposedEmsResourceHolder.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/LocallyExposedEmsResourceHolder.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Messaging.Ems.Common; using Spring.Messaging.Ems.Connections; diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/RecoveryTimeExceededException.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/RecoveryTimeExceededException.cs index c480990d..e8a2ab28 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/RecoveryTimeExceededException.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/RecoveryTimeExceededException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Messaging.Ems.Listener.Adapter; namespace Spring.Messaging.Ems.Listener; diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/SimpleMessageListenerContainer.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/SimpleMessageListenerContainer.cs index e5830401..fc4fc026 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/SimpleMessageListenerContainer.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/SimpleMessageListenerContainer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using Spring.Collections; using Spring.Messaging.Ems.Common; @@ -36,14 +32,8 @@ namespace Spring.Messaging.Ems.Listener; /// Mark Pollack (.NET) public class SimpleMessageListenerContainer : AbstractMessageListenerContainer, IExceptionListener { - #region Logging - private readonly ILogger logger = LogManager.GetLogger(); - #endregion - - #region fields - /// /// The default recovery time interval between connection reconnection attempts /// @@ -68,10 +58,6 @@ public class SimpleMessageListenerContainer : AbstractMessageListenerContainer, private TimeSpan maxRecoveryTime = new TimeSpan(0, 0, 10, 0, 0); - #endregion - - #region Properties - /// /// Gets or sets a value indicating whether to inhibit the delivery of messages published by its own connection. /// Default is "false". @@ -136,8 +122,6 @@ public class SimpleMessageListenerContainer : AbstractMessageListenerContainer, get { return true; } } - #endregion - /// /// Call base class for valdation and then check that if the subscription is durable that the number of /// concurrent consumers is equal to one. diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/Converter/IMessageConverter.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/Converter/IMessageConverter.cs index 55b633a5..05d3d28f 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/Converter/IMessageConverter.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/Converter/IMessageConverter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Messaging.Ems.Common; namespace Spring.Messaging.Ems.Support.Converter; diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/Converter/ITypeMapper.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/Converter/ITypeMapper.cs index c59c0d6b..b3935b25 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/Converter/ITypeMapper.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/Converter/ITypeMapper.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Messaging.Ems.Support.Converter; /// diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/Converter/MessageConversionException.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/Converter/MessageConversionException.cs index 398f953f..0d52a0dd 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/Converter/MessageConversionException.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/Converter/MessageConversionException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Messaging.Ems.Support.Converter; /// Thrown by IMessageConverter implementations when the conversion @@ -26,8 +22,6 @@ namespace Spring.Messaging.Ems.Support.Converter; /// Mark Pollack public class MessageConversionException : EMSException { - #region Constructor (s) / Destructor - /// /// Creates a new instance of the IMessageConverterException class. with the specified message. /// @@ -54,6 +48,4 @@ public class MessageConversionException : EMSException { LinkedException = rootCause; } - - #endregion } diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/Converter/SimpleMessageConverter.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/Converter/SimpleMessageConverter.cs index 6fcdb382..42710acb 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/Converter/SimpleMessageConverter.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/Converter/SimpleMessageConverter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Spring.Messaging.Ems.Common; @@ -109,8 +105,6 @@ public class SimpleMessageConverter : IMessageConverter return messageToConvert; } - #region To Converter Methods - /// Create a EMS TextMessage for the given String. /// the String to convert /// @@ -179,10 +173,6 @@ public class SimpleMessageConverter : IMessageConverter return session.CreateObjectMessage(objectToSend); } - #endregion - - #region From Converter Mehtods - /// Extract a String from the given TextMessage. /// the message to convert /// @@ -236,6 +226,4 @@ public class SimpleMessageConverter : IMessageConverter { return message.TheObject; } - - #endregion } diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/Converter/TypeMapper.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/Converter/TypeMapper.cs index a154dcbe..33e30b12 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/Converter/TypeMapper.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/Converter/TypeMapper.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Spring.Core.TypeResolution; diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/Destinations/DynamicDestinationResolver.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/Destinations/DynamicDestinationResolver.cs index fcea8aa1..2dee5fa8 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/Destinations/DynamicDestinationResolver.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/Destinations/DynamicDestinationResolver.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Messaging.Ems.Common; using Spring.Util; diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/Destinations/EmsDestinationAccessor.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/Destinations/EmsDestinationAccessor.cs index 92697fef..d150d89d 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/Destinations/EmsDestinationAccessor.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/Destinations/EmsDestinationAccessor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Messaging.Ems.Common; using Spring.Util; @@ -35,16 +31,10 @@ namespace Spring.Messaging.Ems.Support.Destinations; /// Mark Pollack (.NET) public class EmsDestinationAccessor : EmsAccessor { - #region Fields - private IDestinationResolver destinationResolver = new DynamicDestinationResolver(); private bool pubSubDomain = false; - #endregion - - #region Properties - /// /// Gets or sets the destination resolver that is to be used to resolve /// Destination references for this accessor. @@ -90,8 +80,6 @@ public class EmsDestinationAccessor : EmsAccessor } } - #endregion - /// /// Resolves the given destination name to a EMS destination. /// diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/Destinations/IDestinationResolver.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/Destinations/IDestinationResolver.cs index 342e4c8c..e09e6924 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/Destinations/IDestinationResolver.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/Destinations/IDestinationResolver.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Messaging.Ems.Common; namespace Spring.Messaging.Ems.Support.Destinations; diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/EmsAccessor.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/EmsAccessor.cs index 82e9a277..bf45b48d 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/EmsAccessor.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/EmsAccessor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Messaging.Ems.Common; using Spring.Objects.Factory; @@ -34,24 +30,14 @@ namespace Spring.Messaging.Ems.Support; /// Mark Pollack (.NET) public class EmsAccessor : IInitializingObject { - #region Logging - private readonly ILogger logger = LogManager.GetLogger(); - #endregion - - #region Fields - private IConnectionFactory connectionFactory; private bool sessionTransacted = false; private int sessionAcknowledgeMode = Session.AUTO_ACKNOWLEDGE; - #endregion - - #region Properties - /// /// Gets or sets the connection factory to use for obtaining EMS Connections. /// @@ -119,8 +105,6 @@ public class EmsAccessor : IInitializingObject } } - #endregion - /// /// Verify that ConnectionFactory property has been set. /// diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/EmsUtils.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/EmsUtils.cs index c6a53ecf..de8ef10b 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/EmsUtils.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/EmsUtils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using Spring.Messaging.Ems.Common; using Spring.Util; @@ -30,12 +26,8 @@ namespace Spring.Messaging.Ems.Support; /// public abstract class EmsUtils { - #region Logging - private static readonly ILogger logger = LogManager.GetLogger(); - #endregion - /// Close the given EMS Connection and ignore any thrown exception. /// This is useful for typical finally blocks in manual EMS code. /// diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Config/MessageListenerContainerObjectDefinitionParser.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Config/MessageListenerContainerObjectDefinitionParser.cs index 3e7ace5e..86e1e457 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Config/MessageListenerContainerObjectDefinitionParser.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Config/MessageListenerContainerObjectDefinitionParser.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Xml; using Apache.NMS; using Spring.Core.TypeResolution; @@ -38,8 +34,6 @@ namespace Spring.Messaging.Nms.Config; /// Mark Pollack (.NET) public class MessageListenerContainerObjectDefinitionParser : IObjectDefinitionParser { - #region Fields - private readonly string LISTENER_ELEMENT = "listener"; private readonly string ID_ATTRIBUTE = "id"; @@ -98,10 +92,6 @@ public class MessageListenerContainerObjectDefinitionParser : IObjectDefinitionP private readonly string EXCEPTION_LISTENER_ATTRIBUTE = "exception-listener"; - #endregion - - #region IObjectDefinitionParser Members - /// /// Parse the specified XmlElement and register the resulting /// ObjectDefinitions with the IObjectDefinitionRegistry @@ -135,8 +125,6 @@ public class MessageListenerContainerObjectDefinitionParser : IObjectDefinitionP return null; } - #endregion - private void ParseListener(XmlElement listenerElement, XmlElement containerElement, ParserContext parserContext) { ObjectDefinitionBuilder listenerDefBuilder = diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Config/NmsNamespaceParser.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Config/NmsNamespaceParser.cs index 19b2c687..fd7d5962 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Config/NmsNamespaceParser.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Config/NmsNamespaceParser.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects.Factory.Xml; namespace Spring.Messaging.Nms.Config; diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/CachedMessageConsumer .cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/CachedMessageConsumer .cs index b3909507..152a0219 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/CachedMessageConsumer .cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/CachedMessageConsumer .cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Apache.NMS; namespace Spring.Messaging.Nms.Connections; diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/CachedMessageProducer.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/CachedMessageProducer.cs index 3a6ec63f..82a5f9ab 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/CachedMessageProducer.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/CachedMessageProducer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Apache.NMS; namespace Spring.Messaging.Nms.Connections; @@ -135,8 +131,6 @@ public class CachedMessageProducer : IMessageProducer return target.SendAsync(destination, message, deliveryMode, priority, timeToLive); } - #region Odd Message Creationg Methods on IMessageProducer - not in-line with JMS APIs. - /// /// Creates the message. /// @@ -264,8 +258,6 @@ public class CachedMessageProducer : IMessageProducer set { target.ProducerTransformer = value; } } - #endregion - /// /// Gets or sets a value indicating what DeliveryMode this /// should use, for example a persistent QOS diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/ChainedExceptionListener.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/ChainedExceptionListener.cs index 7dc82a4f..571c3914 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/ChainedExceptionListener.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/ChainedExceptionListener.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Messaging.Nms.Core; using Spring.Util; diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/ConnectionFactoryUtils.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/ConnectionFactoryUtils.cs index 3176745c..ca0b45f9 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/ConnectionFactoryUtils.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/ConnectionFactoryUtils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Apache.NMS; using Microsoft.Extensions.Logging; using Spring.Messaging.Nms.Support; @@ -33,12 +29,8 @@ namespace Spring.Messaging.Nms.Connections; /// Mark Pollack (.NET) public abstract class ConnectionFactoryUtils { - #region Logging - private static readonly ILogger LOG = LogManager.GetLogger(); - #endregion - /// /// Releases the given connection, stopping it (if necessary) and eventually closing it. /// @@ -292,8 +284,6 @@ public abstract class ConnectionFactoryUtils return session; } - #region ResourceFactory helper classes - private class AnonymousClassResourceFactory : ResourceFactory { private IConnection existingCon; @@ -363,10 +353,6 @@ public abstract class ConnectionFactoryUtils } } - #endregion - - #region Helper classes/interfaces - /// Callback interface for resource creation. /// Serving as argument for the DoGetTransactionalSession method. /// @@ -495,6 +481,4 @@ public abstract class ConnectionFactoryUtils } } } - - #endregion } diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/IDecoratorSession.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/IDecoratorSession.cs index db422bd8..9e2018b6 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/IDecoratorSession.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/IDecoratorSession.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Apache.NMS; namespace Spring.Messaging.Nms.Connections; diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/ISmartConnectionFactory.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/ISmartConnectionFactory.cs index bbce67b8..ec1d473b 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/ISmartConnectionFactory.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/ISmartConnectionFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Apache.NMS; namespace Spring.Messaging.Nms.Connections; diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsConsumer.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsConsumer.cs index 40254bb0..54a49dd4 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsConsumer.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsConsumer.cs @@ -1,6 +1,4 @@ -#region License - -// /* +// /* // * Copyright 2022 the original author or authors. // * // * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ // * limitations under the License. // */ -#endregion - using Apache.NMS; using Spring.Messaging.Nms.Support; diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsContext.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsContext.cs index ce9f8725..1a2b0323 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsContext.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsContext.cs @@ -1,6 +1,4 @@ -#region License - -// /* +// /* // * Copyright 2022 the original author or authors. // * // * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ // * limitations under the License. // */ -#endregion - using Apache.NMS; using Spring.Messaging.Nms.Support; diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsProducer.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsProducer.cs index 61b7c238..49a88095 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsProducer.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsProducer.cs @@ -1,6 +1,4 @@ -#region License - -// /* +// /* // * Copyright 2022 the original author or authors. // * // * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ // * limitations under the License. // */ -#endregion - using System.Collections; using Apache.NMS; using Apache.NMS.Util; diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsTransactionManager.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsTransactionManager.cs index 3a83be5e..de4db135 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsTransactionManager.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsTransactionManager.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; using Apache.NMS; using Microsoft.Extensions.Logging; @@ -69,12 +65,8 @@ namespace Spring.Messaging.Nms.Connections; public class NmsTransactionManager : AbstractPlatformTransactionManager, IResourceTransactionManager, IInitializingObject { - #region Logging Definition - private static readonly ILogger LOG = LogManager.GetLogger(); - #endregion - private IConnectionFactory connectionFactory; /// @@ -121,8 +113,6 @@ public class NmsTransactionManager : AbstractPlatformTransactionManager, } } - #region IInitializingObject Members - /// /// Make sure the ConnectionFactory has been set. /// @@ -134,10 +124,6 @@ public class NmsTransactionManager : AbstractPlatformTransactionManager, } } - #endregion - - #region IResourceTransactionManager Members - /// /// Gets the resource factory that this transaction manager operates on, /// In tihs case the ConnectionFactory @@ -148,8 +134,6 @@ public class NmsTransactionManager : AbstractPlatformTransactionManager, get { return ConnectionFactory; } } - #endregion - /// /// Get the MessageTransactionObject. /// @@ -420,13 +404,9 @@ public class NmsTransactionManager : AbstractPlatformTransactionManager, set { resourceHolder = value; } } - #region ISmartTransactionObject Members - public bool RollbackOnly { get { return resourceHolder.RollbackOnly; } } - - #endregion } } diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/SingleConnectionFactory.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/SingleConnectionFactory.cs index c054e3d7..b37e8e9a 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/SingleConnectionFactory.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/SingleConnectionFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Apache.NMS; using Microsoft.Extensions.Logging; using Spring.Messaging.Nms.Core; @@ -57,14 +53,8 @@ namespace Spring.Messaging.Nms.Connections; /// Mark Pollack (.NET) public class SingleConnectionFactory : IConnectionFactory, IExceptionListener, IInitializingObject, IDisposable { - #region Logging Definition - private static readonly ILogger LOG = LogManager.GetLogger(); - #endregion - - #region Fields - private IConnectionFactory targetConnectionFactory; private string clientId; @@ -93,10 +83,6 @@ public class SingleConnectionFactory : IConnectionFactory, IExceptionListener, I /// private SemaphoreSlimLock connectionMonitor = new SemaphoreSlimLock(); - #endregion - - #region Constructors - /// /// Initializes a new instance of the class. /// @@ -128,10 +114,6 @@ public class SingleConnectionFactory : IConnectionFactory, IExceptionListener, I this.targetConnectionFactory = targetConnectionFactory; } - #endregion - - #region Properties - /// /// Gets or sets the target connection factory which will be used to create a single /// connection. @@ -287,10 +269,6 @@ public class SingleConnectionFactory : IConnectionFactory, IExceptionListener, I set { started = value; } } - #endregion - - #region IConnectionFactory Members - /// /// Creates the connection. /// @@ -344,8 +322,6 @@ public class SingleConnectionFactory : IConnectionFactory, IExceptionListener, I throw new InvalidOperationException("SingleConnectionFactory does not support custom username and password."); } - #endregion - /// /// Initialize the underlying shared Connection. Closes and reinitializes the Connection if an underlying /// Connection is present already. @@ -469,8 +445,6 @@ public class SingleConnectionFactory : IConnectionFactory, IExceptionListener, I } } - #region IInitializingObject Members - /// /// Ensure that the connection or TargetConnectionFactory are specified. /// @@ -482,8 +456,6 @@ public class SingleConnectionFactory : IConnectionFactory, IExceptionListener, I } } - #endregion - /// /// Close the underlying shared connection. The provider of this ConnectionFactory needs to care for proper shutdown. /// As this object implements an application context will automatically @@ -649,8 +621,6 @@ internal class CloseSupressingConnection : IConnection return await target.CreateSessionAsync(acknowledgementMode).Awaiter(); } - #region Pass through implementations to the target connection - public void PurgeTempDestinations() { target.PurgeTempDestinations(); @@ -701,8 +671,6 @@ internal class CloseSupressingConnection : IConnection set { target.RedeliveryPolicy = value; } } - #endregion - /// /// Add information to show this is a shared NMS connection /// diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/SynchedLocalTransactionFailedException.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/SynchedLocalTransactionFailedException.cs index c3cfaf37..0fd6f6a8 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/SynchedLocalTransactionFailedException.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/SynchedLocalTransactionFailedException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using Apache.NMS; @@ -31,8 +27,6 @@ namespace Spring.Messaging.Nms.Connections; [Serializable] public class SynchedLocalTransactionFailedException : NMSException { - #region Constructor (s) / Destructor - /// /// Initializes a new instance of the class. /// @@ -74,6 +68,4 @@ public class SynchedLocalTransactionFailedException : NMSException : base(info, context) { } - - #endregion } diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/UserCredentialsConnectionFactoryAdapter.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/UserCredentialsConnectionFactoryAdapter.cs index 4c930a60..680088a4 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/UserCredentialsConnectionFactoryAdapter.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/UserCredentialsConnectionFactoryAdapter.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Apache.NMS; namespace Spring.Messaging.Nms.Connections; diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/IExceptionListener.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/IExceptionListener.cs index 5b73e9d3..cd3062f3 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/IExceptionListener.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/IExceptionListener.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Messaging.Nms.Core; /// diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/IMessageCreator.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/IMessageCreator.cs index 3b4a0190..8dbdc413 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/IMessageCreator.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/IMessageCreator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Apache.NMS; namespace Spring.Messaging.Nms.Core; diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/IMessageListener.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/IMessageListener.cs index 1540b974..c01794f7 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/IMessageListener.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/IMessageListener.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2006 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Apache.NMS; namespace Spring.Messaging.Nms.Core; diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/IMessagePostProcessor.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/IMessagePostProcessor.cs index 766df3be..0c2a5a1f 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/IMessagePostProcessor.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/IMessagePostProcessor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Apache.NMS; namespace Spring.Messaging.Nms.Core; diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/INmsOperations.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/INmsOperations.cs index 0854f1de..1c9e7cb6 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/INmsOperations.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/INmsOperations.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Apache.NMS; namespace Spring.Messaging.Nms.Core; diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/INmsOperationsAsync.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/INmsOperationsAsync.cs index d9f84ac4..1a7c57c0 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/INmsOperationsAsync.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/INmsOperationsAsync.cs @@ -1,5 +1,3 @@ -#region License - // /* // * Copyright 2022 the original author or authors. // * @@ -16,8 +14,6 @@ // * limitations under the License. // */ -#endregion - using Apache.NMS; namespace Spring.Messaging.Nms.Core; diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/IProducerCallback.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/IProducerCallback.cs index 2de47bcc..a0e149b3 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/IProducerCallback.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/IProducerCallback.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Apache.NMS; namespace Spring.Messaging.Nms.Core; diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/IProducerCallbackAsync.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/IProducerCallbackAsync.cs index e1ad21fe..f5c4f2ff 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/IProducerCallbackAsync.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/IProducerCallbackAsync.cs @@ -1,5 +1,3 @@ -#region License - // /* // * Copyright 2022 the original author or authors. // * @@ -16,8 +14,6 @@ // * limitations under the License. // */ -#endregion - using Apache.NMS; namespace Spring.Messaging.Nms.Core; diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/ISessionCallback.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/ISessionCallback.cs index 49e60b4f..a4ccd57a 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/ISessionCallback.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/ISessionCallback.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Apache.NMS; namespace Spring.Messaging.Nms.Core; diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/ISessionCallbackAsync.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/ISessionCallbackAsync.cs index eb6ab269..e09ed7fb 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/ISessionCallbackAsync.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/ISessionCallbackAsync.cs @@ -1,5 +1,3 @@ -#region License - // /* // * Copyright 2022 the original author or authors. // * @@ -16,8 +14,6 @@ // * limitations under the License. // */ -#endregion - using Apache.NMS; namespace Spring.Messaging.Nms.Core; diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/MessageCreatorDelegate.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/MessageCreatorDelegate.cs index a22c83bc..fcbc30d9 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/MessageCreatorDelegate.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/MessageCreatorDelegate.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Apache.NMS; namespace Spring.Messaging.Nms.Core; diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/MessagePostProcessorDelegate.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/MessagePostProcessorDelegate.cs index 4f5677f2..617c2018 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/MessagePostProcessorDelegate.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/MessagePostProcessorDelegate.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Apache.NMS; namespace Spring.Messaging.Nms.Core; diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsGatewaySupport.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsGatewaySupport.cs index 90f4d55d..9af7eb83 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsGatewaySupport.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsGatewaySupport.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects.Factory; using Apache.NMS; using Microsoft.Extensions.Logging; @@ -35,12 +31,8 @@ namespace Spring.Messaging.Nms.Core; /// public class NmsGatewaySupport : IInitializingObject { - #region Logging - private readonly ILogger logger = LogManager.GetLogger(); - #endregion - private NmsTemplate nmsTemplate; /// diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsTemplate.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsTemplate.cs index 0a9a8922..d2213a25 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsTemplate.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsTemplate.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Messaging.Nms.Connections; using Spring.Messaging.Nms.Support; using Spring.Messaging.Nms.Support.Converter; @@ -48,14 +44,8 @@ namespace Spring.Messaging.Nms.Core; /// Mark Pollack (.NET) public class NmsTemplate : NmsDestinationAccessor, INmsOperations { - #region Logging - private readonly ILogger logger = LogManager.GetLogger(); - #endregion - - #region Fields - /// /// Timeout value indicating that a receive operation should /// check if a message is immediately available without blocking. @@ -89,10 +79,6 @@ public class NmsTemplate : NmsDestinationAccessor, INmsOperations private MsgDeliveryMode deliveryMode = NMSConstants.defaultDeliveryMode; - #endregion - - #region Constructor (s) - /// Create a new NmsTemplate. /// /// Note: The ConnectionFactory has to be set before using the instance. @@ -115,10 +101,6 @@ public class NmsTemplate : NmsDestinationAccessor, INmsOperations AfterPropertiesSet(); } - #endregion - - #region Methods - /// Initialize the default implementations for the template's strategies: /// DynamicDestinationResolver and SimpleMessageConverter. /// @@ -197,10 +179,6 @@ public class NmsTemplate : NmsDestinationAccessor, INmsOperations } } - #endregion - - #region Properties - /// /// Gets or sets the default destination to be used on send/receive operations that do not /// have a destination parameter. @@ -373,8 +351,6 @@ public class NmsTemplate : NmsDestinationAccessor, INmsOperations set { timeToLive = value; } } - #endregion - /// /// Extract the content from the given JMS message. /// @@ -390,8 +366,6 @@ public class NmsTemplate : NmsDestinationAccessor, INmsOperations return null; } - #region NMS Factory Methods - /// Fetch an appropriate Connection from the given MessageResourceHolder. /// /// the MessageResourceHolder @@ -599,10 +573,6 @@ public class NmsTemplate : NmsDestinationAccessor, INmsOperations } } - #endregion - - #region IMessageOperations Implementation - /// /// Execute the action specified by the given action object within /// a NMS Session. @@ -1204,10 +1174,6 @@ public class NmsTemplate : NmsDestinationAccessor, INmsOperations return DoConvertFromMessage(ReceiveSelected(destinationName, messageSelector)); } - #endregion - - #region Supporting Internal Classes - /// /// ResourceFactory implementation that delegates to this template's callback methods. /// @@ -1413,8 +1379,6 @@ public class NmsTemplate : NmsDestinationAccessor, INmsOperations } } - #endregion - private class ExecuteSessionCallbackUsingDelegate : ISessionCallback { private readonly SessionDelegate del; diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsTemplateAsync.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsTemplateAsync.cs index f7a1e4be..06e48899 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsTemplateAsync.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsTemplateAsync.cs @@ -1,5 +1,3 @@ -#region License - // /* // * Copyright 2022 the original author or authors. // * @@ -16,8 +14,6 @@ // * limitations under the License. // */ -#endregion - using Spring.Messaging.Nms.Connections; using Spring.Messaging.Nms.Support; using Spring.Messaging.Nms.Support.Converter; @@ -35,14 +31,8 @@ namespace Spring.Messaging.Nms.Core; /// public class NmsTemplateAsync : NmsDestinationAccessorAsync, INmsOperationsAsync { - #region Logging - private readonly ILogger logger = LogManager.GetLogger(); - #endregion - - #region Fields - /// /// Timeout value indicating that a receive operation should /// check if a message is immediately available without blocking. @@ -76,10 +66,6 @@ public class NmsTemplateAsync : NmsDestinationAccessorAsync, INmsOperationsAsync private MsgDeliveryMode deliveryMode = NMSConstants.defaultDeliveryMode; - #endregion - - #region Constructor (s) - /// Create a new NmsTemplate. /// /// Note: The ConnectionFactory has to be set before using the instance. @@ -102,10 +88,6 @@ public class NmsTemplateAsync : NmsDestinationAccessorAsync, INmsOperationsAsync AfterPropertiesSet(); } - #endregion - - #region Methods - /// Initialize the default implementations for the template's strategies: /// DynamicDestinationResolver and SimpleMessageConverter. /// @@ -184,10 +166,6 @@ public class NmsTemplateAsync : NmsDestinationAccessorAsync, INmsOperationsAsync } } - #endregion - - #region Properties - /// /// Gets or sets the default destination to be used on send/receive operations that do not /// have a destination parameter. @@ -360,8 +338,6 @@ public class NmsTemplateAsync : NmsDestinationAccessorAsync, INmsOperationsAsync set { timeToLive = value; } } - #endregion - /// /// Extract the content from the given JMS message. /// @@ -377,8 +353,6 @@ public class NmsTemplateAsync : NmsDestinationAccessorAsync, INmsOperationsAsync return null; } - #region NMS Factory Methods - /// Fetch an appropriate Connection from the given MessageResourceHolder. /// /// the MessageResourceHolder @@ -586,10 +560,6 @@ public class NmsTemplateAsync : NmsDestinationAccessorAsync, INmsOperationsAsync } } - #endregion - - #region IMessageOperations Implementation - /// /// Execute the action specified by the given action object within /// a NMS Session. @@ -1192,10 +1162,6 @@ public class NmsTemplateAsync : NmsDestinationAccessorAsync, INmsOperationsAsync return DoConvertFromMessage(await ReceiveSelected(destinationName, messageSelector).Awaiter()); } - #endregion - - #region Supporting Internal Classes - /// /// ResourceFactory implementation that delegates to this template's callback methods. /// @@ -1401,8 +1367,6 @@ public class NmsTemplateAsync : NmsDestinationAccessorAsync, INmsOperationsAsync } } - #endregion - private class ExecuteSessionCallbackUsingDelegateAsync : ISessionCallbackAsync { private readonly SessionDelegateAsync del; diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsTrace.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsTrace.cs index 0b0bfb12..d778a8c9 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsTrace.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsTrace.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Apache.NMS; using Microsoft.Extensions.Logging; @@ -32,12 +28,8 @@ namespace Spring.Messaging.Nms.Core; /// Mark Pollack public class NmsTrace : ITrace { - #region Logging Definition - private readonly ILogger log; - #endregion - /// /// Initializes a new instance of the class. The log name used is typeof(NmsTrace). /// diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/ProducerDelegate.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/ProducerDelegate.cs index b4c3ac14..652f64ae 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/ProducerDelegate.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/ProducerDelegate.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Apache.NMS; namespace Spring.Messaging.Nms.Core; diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/SessionDelegate.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/SessionDelegate.cs index 782d3e90..011fd4ea 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/SessionDelegate.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/SessionDelegate.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Apache.NMS; namespace Spring.Messaging.Nms.Core; diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/AbstractListenerContainer.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/AbstractListenerContainer.cs index ecb94365..72892032 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/AbstractListenerContainer.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/AbstractListenerContainer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using Apache.NMS; using Microsoft.Extensions.Logging; @@ -46,14 +42,8 @@ namespace Spring.Messaging.Nms.Listener; /// Mark Pollack(.NET) public abstract class AbstractListenerContainer : NmsDestinationAccessor, ILifecycle, IObjectNameAware, IDisposable { - #region Logging - private readonly ILogger logger = LogManager.GetLogger(); - #endregion - - #region Fields - private String clientId; private bool autoStartup = true; @@ -78,8 +68,6 @@ public abstract class AbstractListenerContainer : NmsDestinationAccessor, ILifec /// protected object lifecycleMonitor = new object(); - #endregion - /// /// Gets or sets the client id for a shared Connection created and used by this container. /// diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/AbstractMessageListenerContainer.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/AbstractMessageListenerContainer.cs index 831ee5e2..fd4fcbf2 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/AbstractMessageListenerContainer.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/AbstractMessageListenerContainer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Messaging.Nms.Core; using Spring.Messaging.Nms.Support; using Spring.Util; @@ -33,14 +29,8 @@ namespace Spring.Messaging.Nms.Listener; /// public abstract class AbstractMessageListenerContainer : AbstractListenerContainer { - #region Logging - private readonly ILogger logger = LogManager.GetLogger(); - #endregion - - #region Fields - private object destination; private String messageSelector; @@ -59,10 +49,6 @@ public abstract class AbstractMessageListenerContainer : AbstractListenerContain private bool acceptMessagesWhileStopping = false; - #endregion - - #region Properties - /// /// Gets or sets the destination to receive messages from. Will be null /// if the configured destination is not an actual Destination type; @@ -268,8 +254,6 @@ public abstract class AbstractMessageListenerContainer : AbstractListenerContain set { acceptMessagesWhileStopping = value; } } - #endregion - /// /// Validate that the destination is not null and that if the subscription is durable, then we are not /// using the Pub/Sub domain. @@ -287,8 +271,6 @@ public abstract class AbstractMessageListenerContainer : AbstractListenerContain } } - #region Template methods for listeners - /// /// Executes the specified listener, /// committing or rolling back the transaction afterwards (if necessary). @@ -325,16 +307,12 @@ public abstract class AbstractMessageListenerContainer : AbstractListenerContain { if (!AcceptMessagesWhileStopping && !IsRunning) { - #region Logging - if (logger.IsEnabled(LogLevel.Warning)) { logger.LogWarning("Rejecting received message because of the listener container " + "having been stopped in the meantime: " + message); } - #endregion - RollbackIfNecessary(session); throw new MessageRejectedWhileStoppingException(); } @@ -605,8 +583,6 @@ public abstract class AbstractMessageListenerContainer : AbstractListenerContain } } - #endregion - /// /// Checks the message listener, throwing an exception /// if it does not correspond to a supported listener type. diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/Adapter/ListenerExecutionFailedException.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/Adapter/ListenerExecutionFailedException.cs index 490ee582..b8ed1d15 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/Adapter/ListenerExecutionFailedException.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/Adapter/ListenerExecutionFailedException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using Apache.NMS; diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/Adapter/MessageListenerAdapter.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/Adapter/MessageListenerAdapter.cs index 0d0f9162..aebdcb30 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/Adapter/MessageListenerAdapter.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/Adapter/MessageListenerAdapter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using Spring.Expressions; using Spring.Messaging.Nms.Core; @@ -66,14 +62,8 @@ namespace Spring.Messaging.Nms.Listener.Adapter; /// Mark Pollack (.NET) public class MessageListenerAdapter : IMessageListener, ISessionAwareMessageListener { - #region Logging - private readonly ILogger logger = LogManager.GetLogger(typeof(MessageListenerAdapter)); - #endregion - - #region Fields - /// /// The default handler method name. /// @@ -91,10 +81,6 @@ public class MessageListenerAdapter : IMessageListener, ISessionAwareMessageList private IMessageConverter messageConverter; - #endregion - - #region Constructors - /// /// Initializes a new instance of the class with default settings. /// @@ -114,8 +100,6 @@ public class MessageListenerAdapter : IMessageListener, ISessionAwareMessageList this.handlerObject = handlerObject; } - #endregion - /// /// Gets or sets the handler object to delegate message listening to. /// diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/ISessionAwareMessageListener.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/ISessionAwareMessageListener.cs index e1ad16d0..97f0429f 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/ISessionAwareMessageListener.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/ISessionAwareMessageListener.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Apache.NMS; namespace Spring.Messaging.Nms.Listener; diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/LocallyExposedNmsResourceHolder.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/LocallyExposedNmsResourceHolder.cs index 3fc5d67b..60eaf6b6 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/LocallyExposedNmsResourceHolder.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/LocallyExposedNmsResourceHolder.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Apache.NMS; using Spring.Messaging.Nms.Connections; diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/RecoveryTimeExceededException.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/RecoveryTimeExceededException.cs index 99ac13af..49019dd7 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/RecoveryTimeExceededException.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/RecoveryTimeExceededException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region - using System.Runtime.Serialization; using Apache.NMS; -#endregion - namespace Spring.Messaging.Nms.Listener; /// diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/SimpleMessageListenerContainer.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/SimpleMessageListenerContainer.cs index afb8bc6d..33d60092 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/SimpleMessageListenerContainer.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/SimpleMessageListenerContainer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Collections; using Spring.Messaging.Nms.Core; using Spring.Messaging.Nms.Support; @@ -36,14 +32,8 @@ namespace Spring.Messaging.Nms.Listener; /// Mark Pollack public class SimpleMessageListenerContainer : AbstractMessageListenerContainer, IExceptionListener { - #region Logging - private readonly ILogger logger = LogManager.GetLogger(); - #endregion - - #region fields - /// /// The default recovery time interval between connection reconnection attempts /// @@ -68,10 +58,6 @@ public class SimpleMessageListenerContainer : AbstractMessageListenerContainer, private TimeSpan maxRecoveryTime = new TimeSpan(0, 0, 10, 0, 0); - #endregion - - #region Properties - /// /// Gets or sets a value indicating whether to inhibit the delivery of messages published by its own connection. /// Default is "false". @@ -132,8 +118,6 @@ public class SimpleMessageListenerContainer : AbstractMessageListenerContainer, get { return true; } } - #endregion - /// /// Call base class for valdation and then check that if the subscription is durable that the number of /// concurrent consumers is equal to one. diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/IMessageConverter.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/IMessageConverter.cs index c3c3228d..0b7aee54 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/IMessageConverter.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/IMessageConverter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Apache.NMS; namespace Spring.Messaging.Nms.Support.Converter; diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/ITypeMapper.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/ITypeMapper.cs index 3eba6dd0..b20ebe59 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/ITypeMapper.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/ITypeMapper.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Messaging.Nms.Support.Converter; /// diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/MessageConversionException.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/MessageConversionException.cs index 83d5ce21..2ba1d877 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/MessageConversionException.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/MessageConversionException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using Apache.NMS; @@ -30,8 +26,6 @@ namespace Spring.Messaging.Nms.Support.Converter; [Serializable] public class MessageConversionException : NMSException { - #region Constructor (s) / Destructor - /// /// Initializes a new instance of the class. /// @@ -73,6 +67,4 @@ public class MessageConversionException : NMSException protected MessageConversionException(SerializationInfo info, StreamingContext context) : base(info, context) { } - - #endregion } diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/SimpleMessageConverter.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/SimpleMessageConverter.cs index ac907076..4ae54b54 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/SimpleMessageConverter.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/SimpleMessageConverter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Apache.NMS; @@ -107,8 +103,6 @@ public class SimpleMessageConverter : IMessageConverter } } - #region To Converter Methods - /// Create a NMS ITextMessage for the given String. /// the String to convert /// @@ -178,10 +172,6 @@ public class SimpleMessageConverter : IMessageConverter return session.CreateObjectMessage(objectToSend); } - #endregion - - #region From Converter Mehtods - /// Extract a String from the given ITextMessage. /// the message to convert /// @@ -233,6 +223,4 @@ public class SimpleMessageConverter : IMessageConverter { return message.Body; } - - #endregion } \ No newline at end of file diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/TypeMapper.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/TypeMapper.cs index 7efb4ca1..6d2e10eb 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/TypeMapper.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/TypeMapper.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Spring.Core.TypeResolution; diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/DynamicDestinationResolver.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/DynamicDestinationResolver.cs index 005b0066..6f75d1e8 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/DynamicDestinationResolver.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/DynamicDestinationResolver.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Util; using Apache.NMS; diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/IDestinationResolver.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/IDestinationResolver.cs index 5b129be6..e97e245a 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/IDestinationResolver.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/IDestinationResolver.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Apache.NMS; namespace Spring.Messaging.Nms.Support.Destinations; diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/NmsDestinationAccessor.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/NmsDestinationAccessor.cs index c08ac6d8..efe182c1 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/NmsDestinationAccessor.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/NmsDestinationAccessor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Util; using Apache.NMS; @@ -35,16 +31,10 @@ namespace Spring.Messaging.Nms.Support.Destinations; /// Mark Pollack (.NET) public class NmsDestinationAccessor : NmsAccessor { - #region Fields - private IDestinationResolver destinationResolver = new DynamicDestinationResolver(); private bool pubSubDomain = false; - #endregion - - #region Properties - /// /// Gets or sets the destination resolver that is to be used to resolve /// IDestination references for this accessor. @@ -90,8 +80,6 @@ public class NmsDestinationAccessor : NmsAccessor } } - #endregion - /// /// Resolves the given destination name to a NMS destination. /// diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/NmsDestinationAccessorAsync.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/NmsDestinationAccessorAsync.cs index 410a8bec..3f5f3ca7 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/NmsDestinationAccessorAsync.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/NmsDestinationAccessorAsync.cs @@ -1,5 +1,3 @@ -#region License - // /* // * Copyright 2022 the original author or authors. // * @@ -16,8 +14,6 @@ // * limitations under the License. // */ -#endregion - using Apache.NMS; using Spring.Util; @@ -29,16 +25,10 @@ namespace Spring.Messaging.Nms.Support.Destinations; /// public class NmsDestinationAccessorAsync : NmsAccessorAsync { - #region Fields - private IDestinationResolver destinationResolver = new DynamicDestinationResolver(); private bool pubSubDomain = false; - #endregion - - #region Properties - /// /// Gets or sets the destination resolver that is to be used to resolve /// IDestination references for this accessor. @@ -84,8 +74,6 @@ public class NmsDestinationAccessorAsync : NmsAccessorAsync } } - #endregion - /// /// Resolves the given destination name to a NMS destination. /// diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/MessageUtils.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/MessageUtils.cs index e3a2d680..244d5f56 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/MessageUtils.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/MessageUtils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Util; using Apache.NMS; using Microsoft.Extensions.Logging; @@ -30,12 +26,8 @@ namespace Spring.Messaging.Nms.Support; /// public abstract class NmsUtils { - #region Logging - private static readonly ILogger logger = LogManager.GetLogger(); - #endregion - /// Close the given NMS Connection and ignore any thrown exception. /// This is useful for typical finally blocks in manual NMS code. /// diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/MessageUtilsAsync.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/MessageUtilsAsync.cs index 480b8a76..41be1a3b 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/MessageUtilsAsync.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/MessageUtilsAsync.cs @@ -1,5 +1,3 @@ -#region License - // /* // * Copyright 2022 the original author or authors. // * @@ -16,8 +14,6 @@ // * limitations under the License. // */ -#endregion - using Spring.Util; using Apache.NMS; using Microsoft.Extensions.Logging; @@ -30,12 +26,8 @@ namespace Spring.Messaging.Nms.Support; /// public abstract class NmsUtilsAsync { - #region Logging - private static readonly ILogger logger = LogManager.GetLogger(); - #endregion - /// Close the given NMS Connection and ignore any thrown exception. /// This is useful for typical finally blocks in manual NMS code. /// diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/NmsAccessor.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/NmsAccessor.cs index d6cc64aa..d5285905 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/NmsAccessor.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/NmsAccessor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Messaging.Nms.Core; using Spring.Objects.Factory; using Apache.NMS; @@ -36,22 +32,12 @@ namespace Spring.Messaging.Nms.Support; /// Mark Pollack (.NET) public class NmsAccessor : IInitializingObject { - #region Logging - private readonly ILogger logger = LogManager.GetLogger(); - #endregion - - #region Fields - private IConnectionFactory connectionFactory; private AcknowledgementMode sessionAcknowledgeMode = AcknowledgementMode.AutoAcknowledge; - #endregion - - #region Properties - /// /// Gets or sets the connection factory to use for obtaining NMS Connections. /// @@ -119,8 +105,6 @@ public class NmsAccessor : IInitializingObject } } - #endregion - /// /// Verify that ConnectionFactory property has been set. /// diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/NmsAccessorAsync.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/NmsAccessorAsync.cs index e76ab631..3d752d22 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/NmsAccessorAsync.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/NmsAccessorAsync.cs @@ -1,5 +1,3 @@ -#region License - // /* // * Copyright 2022 the original author or authors. // * @@ -16,8 +14,6 @@ // * limitations under the License. // */ -#endregion - using Spring.Messaging.Nms.Core; using Spring.Objects.Factory; using Apache.NMS; @@ -31,22 +27,12 @@ namespace Spring.Messaging.Nms.Support; /// public class NmsAccessorAsync : IInitializingObject { - #region Logging - private readonly ILogger logger = LogManager.GetLogger(); - #endregion - - #region Fields - private IConnectionFactory connectionFactory; private AcknowledgementMode sessionAcknowledgeMode = AcknowledgementMode.AutoAcknowledge; - #endregion - - #region Properties - /// /// Gets or sets the connection factory to use for obtaining NMS Connections. /// @@ -114,8 +100,6 @@ public class NmsAccessorAsync : IInitializingObject } } - #endregion - /// /// Verify that ConnectionFactory property has been set. /// diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/SemaphoreSlimLock.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/SemaphoreSlimLock.cs index 5cc0cdac..ef772c7b 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/SemaphoreSlimLock.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/SemaphoreSlimLock.cs @@ -1,5 +1,3 @@ -#region License - // /* // * Copyright 2022 the original author or authors. // * @@ -16,8 +14,6 @@ // * limitations under the License. // */ -#endregion - namespace Spring.Messaging.Nms.Support; /// diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/TaskExtensions.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/TaskExtensions.cs index bebb5bb3..5d86eba0 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/TaskExtensions.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/TaskExtensions.cs @@ -1,5 +1,3 @@ -#region License - // /* // * Copyright 2022 the original author or authors. // * @@ -16,8 +14,6 @@ // * limitations under the License. // */ -#endregion - using System.Runtime.CompilerServices; namespace Spring.Messaging.Nms.Support; diff --git a/src/Spring/Spring.Messaging/Messaging/Core/DefaultMessageQueueFactory.cs b/src/Spring/Spring.Messaging/Messaging/Core/DefaultMessageQueueFactory.cs index 35532067..74da7619 100644 --- a/src/Spring/Spring.Messaging/Messaging/Core/DefaultMessageQueueFactory.cs +++ b/src/Spring/Spring.Messaging/Messaging/Core/DefaultMessageQueueFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Microsoft.Extensions.Logging; using Spring.Context; @@ -56,8 +52,6 @@ public class DefaultMessageQueueFactory : IMessageQueueFactory, IApplicationCont private IConfigurableApplicationContext applicationContext; - #region IMessageQueueFactory Members - /// /// Registers the message queue, its creation specified via the factory method /// MessageQueueCreatorDelegate, with the provided name in the application context @@ -176,10 +170,6 @@ public class DefaultMessageQueueFactory : IMessageQueueFactory, IApplicationCont return applicationContext.ContainsObject(messageConverterObjectName); } - #endregion - - #region IApplicationContextAware Members - /// /// Gets or sets the that this /// object runs in. @@ -222,6 +212,4 @@ public class DefaultMessageQueueFactory : IMessageQueueFactory, IApplicationCont applicationContext = ctx; } } - - #endregion } diff --git a/src/Spring/Spring.Messaging/Messaging/Core/IMessageQueueFactory.cs b/src/Spring/Spring.Messaging/Messaging/Core/IMessageQueueFactory.cs index 41dd63b6..a02c8161 100644 --- a/src/Spring/Spring.Messaging/Messaging/Core/IMessageQueueFactory.cs +++ b/src/Spring/Spring.Messaging/Messaging/Core/IMessageQueueFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Messaging.Support; using Spring.Messaging.Support.Converters; diff --git a/src/Spring/Spring.Messaging/Messaging/Core/IMessageQueueOperations.cs b/src/Spring/Spring.Messaging/Messaging/Core/IMessageQueueOperations.cs index 18d08061..d63143c8 100644 --- a/src/Spring/Spring.Messaging/Messaging/Core/IMessageQueueOperations.cs +++ b/src/Spring/Spring.Messaging/Messaging/Core/IMessageQueueOperations.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Messaging.Support.Converters; #if NETSTANDARD diff --git a/src/Spring/Spring.Messaging/Messaging/Core/LocallyExposedMessageQueueResourceHolder.cs b/src/Spring/Spring.Messaging/Messaging/Core/LocallyExposedMessageQueueResourceHolder.cs index 2e2a0a6b..d66b6f99 100644 --- a/src/Spring/Spring.Messaging/Messaging/Core/LocallyExposedMessageQueueResourceHolder.cs +++ b/src/Spring/Spring.Messaging/Messaging/Core/LocallyExposedMessageQueueResourceHolder.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - #if NETSTANDARD using Experimental.System.Messaging; diff --git a/src/Spring/Spring.Messaging/Messaging/Core/MessagePostProcessorDelegate.cs b/src/Spring/Spring.Messaging/Messaging/Core/MessagePostProcessorDelegate.cs index cfbd8c79..9f2dbdaa 100644 --- a/src/Spring/Spring.Messaging/Messaging/Core/MessagePostProcessorDelegate.cs +++ b/src/Spring/Spring.Messaging/Messaging/Core/MessagePostProcessorDelegate.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - #if NETSTANDARD using Experimental.System.Messaging; diff --git a/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueGatewaySupport.cs b/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueGatewaySupport.cs index 628a5a2b..2dcb4c2e 100644 --- a/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueGatewaySupport.cs +++ b/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueGatewaySupport.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects.Factory; namespace Spring.Messaging.Core; diff --git a/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueMetadata.cs b/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueMetadata.cs index 310f798e..4359e27f 100644 --- a/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueMetadata.cs +++ b/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueMetadata.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Messaging.Core; /// diff --git a/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueMetadataCache.cs b/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueMetadataCache.cs index e627fb26..9d7c7a2f 100644 --- a/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueMetadataCache.cs +++ b/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueMetadataCache.cs @@ -11,12 +11,8 @@ namespace Spring.Messaging.Core; /// public class MessageQueueMetadataCache : IApplicationContextAware, IInitializingObject { - #region Logging Definition - private static readonly ILogger LOG = LogManager.GetLogger(); - #endregion - private readonly IDictionary itemStore = new Hashtable(); private IConfigurableApplicationContext configurableApplicationContext; @@ -68,15 +64,11 @@ public class MessageQueueMetadataCache : IApplicationContextAware, IInitializing } else { - #region Logging - if (LOG.IsEnabled(LogLevel.Warning)) { LOG.LogWarning("Path for MessageQueueFactoryObject named [" + mqfo.ObjectName + "] is null, so can't cache its metadata."); } - - #endregion } } else diff --git a/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueResourceHolder.cs b/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueResourceHolder.cs index c2404364..4eb0a42e 100644 --- a/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueResourceHolder.cs +++ b/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueResourceHolder.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Transaction.Support; #if NETSTANDARD diff --git a/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueTemplate.cs b/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueTemplate.cs index a3a02302..2c355329 100644 --- a/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueTemplate.cs +++ b/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueTemplate.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using Spring.Context; using Spring.Messaging.Support.Converters; @@ -73,14 +69,8 @@ namespace Spring.Messaging.Core; /// public class MessageQueueTemplate : IMessageQueueOperations, IInitializingObject, IApplicationContextAware { - #region Logging Definition - private static readonly ILogger LOG = LogManager.GetLogger(typeof(MessageQueueTemplate)); - #endregion - - #region Fields - private string defaultMessageQueueObjectName; private string messageConverterObjectName; @@ -96,10 +86,6 @@ public class MessageQueueTemplate : IMessageQueueOperations, IInitializingObject /// public const string METADATA_CACHE_NAME = "__MessageQueueMetadataCache__"; - #endregion - - #region Constructors - /// /// Initializes a new instance of the class. /// @@ -116,10 +102,6 @@ public class MessageQueueTemplate : IMessageQueueOperations, IInitializingObject defaultMessageQueueObjectName = messageQueueName; } - #endregion - - #region Properties - /// /// Gets or sets the message queue factory to use for creating MessageQueue and IMessageConverters. /// Default value is one that support thread local instances. @@ -214,10 +196,6 @@ public class MessageQueueTemplate : IMessageQueueOperations, IInitializingObject set { metadataCache = value; } } - #endregion - - #region IApplicationContextAware Members - /// /// Gets or sets the that this /// object runs in. @@ -261,10 +239,6 @@ public class MessageQueueTemplate : IMessageQueueOperations, IInitializingObject } } - #endregion - - #region IInitializingObject Members - /// /// Invoked by an /// after it has injected all of an object's dependencies. @@ -321,25 +295,17 @@ public class MessageQueueTemplate : IMessageQueueOperations, IInitializingObject } else { - #region Logging - if (LOG.IsEnabled(LogLevel.Warning)) { LOG.LogWarning("The ApplicationContext property has not been set, so the MessageQueueMetadataCache can not be automatically generated. " + "Please explictly set the MessageQueueMetadataCache using the property MetadataCache or set the ApplicationContext property. " + "This will only effect the use of MessageQueueTemplate when publishing to remote queues."); } - - #endregion } } } } - #endregion - - #region IMessageQueueOperations Members - /// /// Send the given object to the default destination, converting the object /// to a MSMQ message with a configured IMessageConverter. @@ -495,10 +461,6 @@ public class MessageQueueTemplate : IMessageQueueOperations, IInitializingObject DoSend(messageQueue, message); } - #endregion - - #region Protected Methods - /// /// Sends the message to the given message queue. /// @@ -683,6 +645,4 @@ public class MessageQueueTemplate : IMessageQueueOperations, IInitializingObject throw new SystemException("No DefaultMessageQueueObjectName specified. Check configuration of MessageQueueTemplate."); } } - - #endregion } diff --git a/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueTransactionManager.cs b/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueTransactionManager.cs index 4540f020..8b758e99 100644 --- a/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueTransactionManager.cs +++ b/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueTransactionManager.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using Spring.Data.Core; using Spring.Transaction; @@ -59,12 +55,8 @@ public class MessageQueueTransactionManager : AbstractPlatformTransactionManager public static readonly string CURRENT_TRANSACTION_SLOTNAME = UniqueKey.GetTypeScopedString(typeof(MessageQueueTransaction), "Current"); - #region Logging Definition - private static readonly ILogger LOG = LogManager.GetLogger(typeof(MessageQueueTransactionManager)); - #endregion - /// /// Initializes a new instance of the class. /// @@ -272,13 +264,9 @@ public class MessageQueueTransactionManager : AbstractPlatformTransactionManager set { resourceHolder = value; } } - #region ISmartTransactionObject Members - public bool RollbackOnly { get { return resourceHolder.RollbackOnly; } } - - #endregion } } \ No newline at end of file diff --git a/src/Spring/Spring.Messaging/Messaging/Core/QueueUtils.cs b/src/Spring/Spring.Messaging/Messaging/Core/QueueUtils.cs index dd1c37c9..6db76db7 100644 --- a/src/Spring/Spring.Messaging/Messaging/Core/QueueUtils.cs +++ b/src/Spring/Spring.Messaging/Messaging/Core/QueueUtils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Context; using Spring.Messaging.Support.Converters; using Spring.Objects.Factory.Support; @@ -97,8 +93,6 @@ internal class MessageQueueResourceSynchronization : ITransactionSynchronization this.resourceKey = resourceKey; } - #region ITransactionSynchronization Members - public void Suspend() { if (holderActive) @@ -135,8 +129,6 @@ internal class MessageQueueResourceSynchronization : ITransactionSynchronization { //TODO SPRNET-1244 } - - #endregion } /// Callback interface for resource creation. diff --git a/src/Spring/Spring.Messaging/Messaging/Listener/AbstractListenerContainer.cs b/src/Spring/Spring.Messaging/Messaging/Listener/AbstractListenerContainer.cs index 465665b2..b87e4e44 100644 --- a/src/Spring/Spring.Messaging/Messaging/Listener/AbstractListenerContainer.cs +++ b/src/Spring/Spring.Messaging/Messaging/Listener/AbstractListenerContainer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using Spring.Objects.Factory; @@ -41,12 +37,8 @@ namespace Spring.Messaging.Listener; /// Mark Pollack public abstract class AbstractListenerContainer : IInitializingObject, IObjectNameAware, IDisposable { - #region Logging Definition - private static readonly ILogger LOG = LogManager.GetLogger(typeof(AbstractListenerContainer)); - #endregion - private bool autoStartup = true; private string objectName; @@ -54,8 +46,6 @@ public abstract class AbstractListenerContainer : IInitializingObject, IObjectNa private bool running; private object lifecycleMonitor = new object(); - #region Properties - /// /// Sets a value indicating whether to automatically start the container after initialization. /// Default is "true"; set this to "false" to allow for manual startup though the @@ -99,8 +89,6 @@ public abstract class AbstractListenerContainer : IInitializingObject, IObjectNa } } - #region IObjectNameAware Members - /// /// Return the object name that this listener container has been assigned /// in its containing object factory, if any. @@ -111,12 +99,6 @@ public abstract class AbstractListenerContainer : IInitializingObject, IObjectNa get { return objectName; } } - #endregion - - #endregion - - #region IInitializingObject Members - /// /// Delegates to and /// @@ -126,10 +108,6 @@ public abstract class AbstractListenerContainer : IInitializingObject, IObjectNa Initialize(); } - #endregion - - #region IDisposable Members - /// /// Calls when the application context destroys the container instance. /// @@ -138,8 +116,6 @@ public abstract class AbstractListenerContainer : IInitializingObject, IObjectNa Shutdown(); } - #endregion - /// /// Validates the configuration of this container /// The default implementation is empty. To be overridden in subclasses. @@ -245,8 +221,6 @@ public abstract class AbstractListenerContainer : IInitializingObject, IObjectNa return true; } - #region Abstract Methods - /// /// Subclasses need to implement this method for their specific /// listener management process. @@ -258,6 +232,4 @@ public abstract class AbstractListenerContainer : IInitializingObject, IObjectNa /// listener management process. /// protected abstract void DoShutdown(); - - #endregion } diff --git a/src/Spring/Spring.Messaging/Messaging/Listener/AbstractMessageListenerContainer.cs b/src/Spring/Spring.Messaging/Messaging/Listener/AbstractMessageListenerContainer.cs index ea4f1cf0..c738d724 100644 --- a/src/Spring/Spring.Messaging/Messaging/Listener/AbstractMessageListenerContainer.cs +++ b/src/Spring/Spring.Messaging/Messaging/Listener/AbstractMessageListenerContainer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using Spring.Context; using Spring.Messaging.Core; @@ -43,14 +39,8 @@ namespace Spring.Messaging.Listener; /// Mark Pollack public abstract class AbstractMessageListenerContainer : AbstractListenerContainer, IApplicationContextAware { - #region Logging Definition - private static readonly ILogger LOG = LogManager.GetLogger(typeof(AbstractMessageListenerContainer)); - #endregion - - #region Fields - private string messageQueueObjectName; private IMessageQueueFactory messageQueueFactory; @@ -68,10 +58,6 @@ public abstract class AbstractMessageListenerContainer : AbstractListenerContain private TimeSpan recoveryTimeSpan = new TimeSpan(0, 0, 0, 1, 0); - #endregion - - #region Properties - /// /// Gets or sets the message queue factory. /// @@ -123,10 +109,6 @@ public abstract class AbstractMessageListenerContainer : AbstractListenerContain set { recoveryTimeSpan = value; } } - #endregion - - #region IApplicationContextAware Members - /// /// Gets or sets the that this /// object runs in. @@ -159,10 +141,6 @@ public abstract class AbstractMessageListenerContainer : AbstractListenerContain set { applicationContext = value; } } - #endregion - - #region Protected Methods - /// /// Validates that the is not null. If /// is null, a is created. Can be be overridden in subclasses. @@ -244,6 +222,4 @@ public abstract class AbstractMessageListenerContainer : AbstractListenerContain mq.Dispose(); } } - - #endregion } \ No newline at end of file diff --git a/src/Spring/Spring.Messaging/Messaging/Listener/AbstractPeekingMessageListenerContainer.cs b/src/Spring/Spring.Messaging/Messaging/Listener/AbstractPeekingMessageListenerContainer.cs index 6df7e433..0476f93a 100644 --- a/src/Spring/Spring.Messaging/Messaging/Listener/AbstractPeekingMessageListenerContainer.cs +++ b/src/Spring/Spring.Messaging/Messaging/Listener/AbstractPeekingMessageListenerContainer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - #if NETSTANDARD using Experimental.System.Messaging; #else @@ -51,14 +47,8 @@ namespace Spring.Messaging.Listener; /// public abstract class AbstractPeekingMessageListenerContainer : AbstractMessageListenerContainer { - #region Logging Definition - private static readonly ILogger LOG = LogManager.GetLogger(typeof(AbstractPeekingMessageListenerContainer)); - #endregion - - #region Fields - private Thread dispatcherThread; private ManualResetEvent stopEvent = new ManualResetEvent(false); @@ -74,10 +64,6 @@ public abstract class AbstractPeekingMessageListenerContainer : AbstractMessageL private TimeSpan listenerTimeLimit = TimeSpan.Zero; - #endregion - - #region Properties - /// /// Gets or sets the listener time limit to continuously receive messages. /// The value is specified in milliseconds. The default value is TimeSpan.Zero, @@ -121,10 +107,6 @@ public abstract class AbstractPeekingMessageListenerContainer : AbstractMessageL get { return messageQueue; } } - #endregion - - #region Protected Container Lifecycle Methods - /// /// Retrieves a MessageQueue instance given the MessageQueueObjectName /// @@ -180,10 +162,6 @@ public abstract class AbstractPeekingMessageListenerContainer : AbstractMessageL } } - #endregion - - #region Protected Methods - /// /// Starts peeking on the DefaultMessageQueue. This is the method that must be called /// again at the end of message procesing to continue the peeking process. @@ -245,8 +223,6 @@ public abstract class AbstractPeekingMessageListenerContainer : AbstractMessageL LOG.LogDebug("Submitting " + numberOfListenersToSchedule + " listener work items"); - #region Submit to thread pool up to max number of concurrent listeners - for (int i = 1; i <= numberOfListenersToSchedule; i++) { bool wasQueued = ThreadPool.QueueUserWorkItem(new WaitCallback(ReceiveAndExecute), MessageQueue); @@ -264,8 +240,6 @@ public abstract class AbstractPeekingMessageListenerContainer : AbstractMessageL Monitor.PulseAll(activeListenerMonitor); } - - #endregion } catch (MessageQueueException mex) { @@ -316,8 +290,6 @@ public abstract class AbstractPeekingMessageListenerContainer : AbstractMessageL { LOG.LogDebug("Executing ReceiveAndExecute"); - #region Increment Active Listener Count - lock (activeListenerMonitor) { activeListenerCount++; @@ -327,8 +299,6 @@ public abstract class AbstractPeekingMessageListenerContainer : AbstractMessageL Monitor.PulseAll(activeListenerMonitor); } - #endregion - DateTime expirationTime = DateTime.Now.Add(ListenerTimeLimit); while (!listenerTimeOut && messageReceived) { @@ -361,8 +331,6 @@ public abstract class AbstractPeekingMessageListenerContainer : AbstractMessageL { LOG.LogDebug("Exiting ReceiveAndExecute"); - #region Decrementing Listener Count and call StartPeeking if last listener or there are still messages to process - lock (activeListenerMonitor) { activeListenerCount--; @@ -382,8 +350,6 @@ public abstract class AbstractPeekingMessageListenerContainer : AbstractMessageL Monitor.PulseAll(activeListenerMonitor); } - - #endregion } } @@ -450,6 +416,4 @@ public abstract class AbstractPeekingMessageListenerContainer : AbstractMessageL protected virtual void BeforeMessageReceived(MessageQueue messageQueue) { } - - #endregion } diff --git a/src/Spring/Spring.Messaging/Messaging/Listener/AbstractSendToQueueExceptionHandler.cs b/src/Spring/Spring.Messaging/Messaging/Listener/AbstractSendToQueueExceptionHandler.cs index f5244273..2422454d 100644 --- a/src/Spring/Spring.Messaging/Messaging/Listener/AbstractSendToQueueExceptionHandler.cs +++ b/src/Spring/Spring.Messaging/Messaging/Listener/AbstractSendToQueueExceptionHandler.cs @@ -70,8 +70,6 @@ public abstract class AbstractSendToQueueExceptionHandler : IInitializingObject, set { messageQueueObjectName = value; } } - #region IApplicationContextAware Members - /// /// Gets or sets the that this /// object runs in. @@ -104,10 +102,6 @@ public abstract class AbstractSendToQueueExceptionHandler : IInitializingObject, set { applicationContext = value; } } - #endregion - - #region IInitializingObject Members - /// /// Ensure that the MessageQueueObject name is set and creates a /// if no @@ -136,6 +130,4 @@ public abstract class AbstractSendToQueueExceptionHandler : IInitializingObject, //Create an instance so we can 'fail-fast' if there isn't an DefaultMessageQueue unde MessageQueue mq = MessageQueueFactory.CreateMessageQueue(messageQueueObjectName); } - - #endregion } diff --git a/src/Spring/Spring.Messaging/Messaging/Listener/AbstractTransactionalMessageListenerContainer.cs b/src/Spring/Spring.Messaging/Messaging/Listener/AbstractTransactionalMessageListenerContainer.cs index 2d02c445..fb011381 100644 --- a/src/Spring/Spring.Messaging/Messaging/Listener/AbstractTransactionalMessageListenerContainer.cs +++ b/src/Spring/Spring.Messaging/Messaging/Listener/AbstractTransactionalMessageListenerContainer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using Spring.Data.Core; using Spring.Messaging.Core; @@ -51,12 +47,8 @@ namespace Spring.Messaging.Listener; /// public abstract class AbstractTransactionalMessageListenerContainer : AbstractPeekingMessageListenerContainer { - #region Logging Definition - private static readonly ILogger LOG = LogManager.GetLogger(typeof(AbstractTransactionalMessageListenerContainer)); - #endregion - private IPlatformTransactionManager platformTransactionManager; private DefaultTransactionDefinition transactionDefinition = new DefaultTransactionDefinition(); diff --git a/src/Spring/Spring.Messaging/Messaging/Listener/DistributedTxMessageListenerContainer.cs b/src/Spring/Spring.Messaging/Messaging/Listener/DistributedTxMessageListenerContainer.cs index f11b67ef..00e5a832 100644 --- a/src/Spring/Spring.Messaging/Messaging/Listener/DistributedTxMessageListenerContainer.cs +++ b/src/Spring/Spring.Messaging/Messaging/Listener/DistributedTxMessageListenerContainer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Transactions; using Microsoft.Extensions.Logging; using Spring.Transaction; @@ -54,12 +50,8 @@ namespace Spring.Messaging.Listener; /// public class DistributedTxMessageListenerContainer : AbstractTransactionalMessageListenerContainer { - #region Logging Definition - private static readonly ILogger LOG = LogManager.GetLogger(typeof(DistributedTxMessageListenerContainer)); - #endregion - private IDistributedTransactionExceptionHandler distributedTransactionExceptionHandler; /// @@ -100,15 +92,11 @@ public class DistributedTxMessageListenerContainer : AbstractTransactionalMessag protected override bool DoReceiveAndExecuteUsingPlatformTransactionManager(MessageQueue mq, ITransactionStatus status) { - #region Logging - if (LOG.IsEnabled(LogLevel.Debug)) { LOG.LogDebug("Executing DoReceiveAndExecuteUsingTxScopeTransactionManager"); } - #endregion Logging - //We are sure to be talking to a second resource manager, so avoid going through //the promotable transaction and force a distributed transaction right from the start. TransactionInterop.GetTransmitterPropagationToken(System.Transactions.Transaction.Current); @@ -124,15 +112,11 @@ public class DistributedTxMessageListenerContainer : AbstractTransactionalMessag { //expected to occur occasionally - #region Logging - if (LOG.IsEnabled(LogLevel.Trace)) { LOG.LogTrace("MessageQueueErrorCode.IOTimeout: No message available to receive. May have been processed by another thread."); } - #endregion - status.SetRollbackOnly(); return false; // no more peeking unless this is the last listener thread } @@ -151,30 +135,22 @@ public class DistributedTxMessageListenerContainer : AbstractTransactionalMessag if (message == null) { - #region Logging - if (LOG.IsEnabled(LogLevel.Trace)) { LOG.LogTrace("Message recieved is null from Queue = [" + mq.Path + "]"); } - #endregion - status.SetRollbackOnly(); return false; // no more peeking unless this is the last listener thread } try { - #region Logging - if (LOG.IsEnabled(LogLevel.Debug)) { LOG.LogDebug("Received message [" + message.Id + "] on queue [" + mq.Path + "]"); } - #endregion - MessageReceived(message); if (DistributedTransactionExceptionHandler != null) { diff --git a/src/Spring/Spring.Messaging/Messaging/Listener/IDistributedTransactionExceptionHandler.cs b/src/Spring/Spring.Messaging/Messaging/Listener/IDistributedTransactionExceptionHandler.cs index d1438f53..122ae4cb 100644 --- a/src/Spring/Spring.Messaging/Messaging/Listener/IDistributedTransactionExceptionHandler.cs +++ b/src/Spring/Spring.Messaging/Messaging/Listener/IDistributedTransactionExceptionHandler.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - #if NETSTANDARD using Experimental.System.Messaging; diff --git a/src/Spring/Spring.Messaging/Messaging/Listener/IExceptionHandler.cs b/src/Spring/Spring.Messaging/Messaging/Listener/IExceptionHandler.cs index ee66de48..78b8c8ac 100644 --- a/src/Spring/Spring.Messaging/Messaging/Listener/IExceptionHandler.cs +++ b/src/Spring/Spring.Messaging/Messaging/Listener/IExceptionHandler.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - #if NETSTANDARD using Experimental.System.Messaging; diff --git a/src/Spring/Spring.Messaging/Messaging/Listener/IMessageListener.cs b/src/Spring/Spring.Messaging/Messaging/Listener/IMessageListener.cs index 403072ea..9c6b46b0 100644 --- a/src/Spring/Spring.Messaging/Messaging/Listener/IMessageListener.cs +++ b/src/Spring/Spring.Messaging/Messaging/Listener/IMessageListener.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - #if NETSTANDARD using Experimental.System.Messaging; diff --git a/src/Spring/Spring.Messaging/Messaging/Listener/IMessageTransactionExceptionHandler.cs b/src/Spring/Spring.Messaging/Messaging/Listener/IMessageTransactionExceptionHandler.cs index 35af6803..b20f8ecc 100644 --- a/src/Spring/Spring.Messaging/Messaging/Listener/IMessageTransactionExceptionHandler.cs +++ b/src/Spring/Spring.Messaging/Messaging/Listener/IMessageTransactionExceptionHandler.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - #if NETSTANDARD using Experimental.System.Messaging; diff --git a/src/Spring/Spring.Messaging/Messaging/Listener/ListenerExecutionFailedException.cs b/src/Spring/Spring.Messaging/Messaging/Listener/ListenerExecutionFailedException.cs index c268ced1..2d491cc9 100644 --- a/src/Spring/Spring.Messaging/Messaging/Listener/ListenerExecutionFailedException.cs +++ b/src/Spring/Spring.Messaging/Messaging/Listener/ListenerExecutionFailedException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; namespace Spring.Messaging.Listener; diff --git a/src/Spring/Spring.Messaging/Messaging/Listener/MessageListenerAdapter.cs b/src/Spring/Spring.Messaging/Messaging/Listener/MessageListenerAdapter.cs index 505378d9..f0741786 100644 --- a/src/Spring/Spring.Messaging/Messaging/Listener/MessageListenerAdapter.cs +++ b/src/Spring/Spring.Messaging/Messaging/Listener/MessageListenerAdapter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using Spring.Context; using Spring.Expressions; @@ -114,19 +110,13 @@ namespace Spring.Messaging.Listener; /// Mark Pollack public class MessageListenerAdapter : IMessageListener, IApplicationContextAware, IInitializingObject { - #region Logging - private static readonly ILogger logger = LogManager.GetLogger(typeof(MessageListenerAdapter)); - #endregion - /// /// Out-of-the-box value for the default listener method: "HandleMessage" /// public static readonly string ORIGINAL_DEFAULT_LISTENER_METHOD = "HandleMessage"; - #region Fields - private IApplicationContext applicationContext; private object handlerObject; @@ -143,10 +133,6 @@ public class MessageListenerAdapter : IMessageListener, IApplicationContextAware private IMessageQueueFactory messageQueueFactory; - #endregion - - #region Constructors - /// /// Initializes a new instance of the class. /// @@ -166,8 +152,6 @@ public class MessageListenerAdapter : IMessageListener, IApplicationContextAware this.handlerObject = handlerObject; } - #endregion - /// /// Gets or sets the handler object to delegate message listening to. /// @@ -210,8 +194,6 @@ public class MessageListenerAdapter : IMessageListener, IApplicationContextAware set { processingExpression = value; } } - #region IInitializingObject Members - /// /// Invoked by an /// after it has injected all of an object's dependencies. @@ -260,10 +242,6 @@ public class MessageListenerAdapter : IMessageListener, IApplicationContextAware } } - #endregion - - #region IApplicationContextAware Members - /// /// Gets or sets the that this /// object runs in. @@ -296,8 +274,6 @@ public class MessageListenerAdapter : IMessageListener, IApplicationContextAware set { applicationContext = value; } } - #endregion - /// /// Gets or sets the message queue factory. /// @@ -390,8 +366,6 @@ public class MessageListenerAdapter : IMessageListener, IApplicationContextAware set { messageQueueTemplate = value; } } - #region IMessageListener Members - /// /// Called when message is received. /// @@ -419,8 +393,6 @@ public class MessageListenerAdapter : IMessageListener, IApplicationContextAware } } - #endregion - /// /// Gets the name of the handler method. /// diff --git a/src/Spring/Spring.Messaging/Messaging/Listener/NonTransactionalMessageListenerContainer.cs b/src/Spring/Spring.Messaging/Messaging/Listener/NonTransactionalMessageListenerContainer.cs index 84b1958b..c65d1222 100644 --- a/src/Spring/Spring.Messaging/Messaging/Listener/NonTransactionalMessageListenerContainer.cs +++ b/src/Spring/Spring.Messaging/Messaging/Listener/NonTransactionalMessageListenerContainer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - #if NETSTANDARD using Experimental.System.Messaging; #else @@ -38,12 +34,8 @@ namespace Spring.Messaging.Listener; /// Mark Pollack public class NonTransactionalMessageListenerContainer : AbstractPeekingMessageListenerContainer { - #region Logging Definition - private static readonly ILogger LOG = LogManager.GetLogger(typeof(NonTransactionalMessageListenerContainer)); - #endregion - private IExceptionHandler exceptionHandler; /// @@ -83,15 +75,11 @@ public class NonTransactionalMessageListenerContainer : AbstractPeekingMessageLi Message message = null; try { - #region Logging - if (LOG.IsEnabled(LogLevel.Trace)) { LOG.LogTrace("Receiving message with zero timeout for queue = [" + mq.Path + "]"); } - #endregion - BeforeMessageReceived(mq); message = mq.Receive(TimeSpan.Zero); } @@ -101,31 +89,23 @@ public class NonTransactionalMessageListenerContainer : AbstractPeekingMessageLi { //expected to occur occasionally - #region Logging - if (LOG.IsEnabled(LogLevel.Trace)) { LOG.LogTrace("MessageQueueErrorCode.IOTimeout: No message available to receive. May have been processed by another thread."); } - #endregion - return false; // no more peeking unless this is the last listener thread } else { // A real issue in receiving the message - #region Logging - if (LOG.IsEnabled(LogLevel.Error)) { LOG.LogError("Error receiving message from MessageQueue [" + mq.Path + "], closing queue and clearing connection cache."); } - #endregion - lock (messageQueueMonitor) { mq.Close(); @@ -138,29 +118,21 @@ public class NonTransactionalMessageListenerContainer : AbstractPeekingMessageLi if (message == null) { - #region Logging - if (LOG.IsEnabled(LogLevel.Trace)) { LOG.LogTrace("Message recieved is null from Queue = [" + mq.Path + "]"); } - #endregion - return false; // no more peeking unless this is the last listener thread } try { - #region Logging - if (LOG.IsEnabled(LogLevel.Debug)) { LOG.LogDebug("Received message [" + message.Id + "] on queue [" + mq.Path + "]"); } - #endregion - MessageReceived(message); DoExecuteListener(message); } diff --git a/src/Spring/Spring.Messaging/Messaging/Listener/SendToQueueDistributedTransactionExceptionHandler.cs b/src/Spring/Spring.Messaging/Messaging/Listener/SendToQueueDistributedTransactionExceptionHandler.cs index f4ba057a..dd85c128 100644 --- a/src/Spring/Spring.Messaging/Messaging/Listener/SendToQueueDistributedTransactionExceptionHandler.cs +++ b/src/Spring/Spring.Messaging/Messaging/Listener/SendToQueueDistributedTransactionExceptionHandler.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - #if NETSTANDARD using Experimental.System.Messaging; #else @@ -37,14 +33,8 @@ namespace Spring.Messaging.Listener; public class SendToQueueDistributedTransactionExceptionHandler : AbstractSendToQueueExceptionHandler, IDistributedTransactionExceptionHandler { - #region Logging Definition - private static readonly ILogger LOG = LogManager.GetLogger(typeof(SendToQueueDistributedTransactionExceptionHandler)); - #endregion - - #region IDistributedTransactionExceptionHandler Members - /// /// Determines whether the incoming message is a poison message. This method is /// called before the is invoked. @@ -114,8 +104,6 @@ public class SendToQueueDistributedTransactionExceptionHandler : AbstractSendToQ } } - #endregion - /// /// Sends the message to queue. /// @@ -125,29 +113,21 @@ public class SendToQueueDistributedTransactionExceptionHandler : AbstractSendToQ MessageQueue mq = MessageQueueFactory.CreateMessageQueue(MessageQueueObjectName); try { - #region Logging - if (LOG.IsEnabled(LogLevel.Information)) { LOG.LogInformation("Sending message with id = [" + message.Id + "] to queue [" + mq.Path + "]."); } - #endregion - mq.Send(message, MessageQueueTransactionType.Automatic); } catch (Exception e) { - #region Logging - if (LOG.IsEnabled(LogLevel.Error)) { string message1 = "Could not send message with id = [" + message.Id + "] to queue [" + mq.Path + "]."; LOG.LogError(e, message1); LOG.LogError("Message will not be processed. Message Body = " + message.Body); } - - #endregion } } } diff --git a/src/Spring/Spring.Messaging/Messaging/Listener/SendToQueueExceptionHandler.cs b/src/Spring/Spring.Messaging/Messaging/Listener/SendToQueueExceptionHandler.cs index aecabb58..d0db3db1 100644 --- a/src/Spring/Spring.Messaging/Messaging/Listener/SendToQueueExceptionHandler.cs +++ b/src/Spring/Spring.Messaging/Messaging/Listener/SendToQueueExceptionHandler.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - #if NETSTANDARD using Experimental.System.Messaging; #else @@ -35,20 +31,10 @@ namespace Spring.Messaging.Listener; /// public class SendToQueueExceptionHandler : AbstractSendToQueueExceptionHandler, IMessageTransactionExceptionHandler { - #region Logging Definition - private static readonly ILogger LOG = LogManager.GetLogger(typeof(SendToQueueExceptionHandler)); - #endregion - - #region Fields - private string[] messageAlreadyProcessedExceptionNames; - #endregion - - #region Properties - /// /// Gets or sets the exception anmes that indicate the message has already /// been processed. If the exception thrown matches one of these names then @@ -62,10 +48,6 @@ public class SendToQueueExceptionHandler : AbstractSendToQueueExceptionHandler, get { return messageAlreadyProcessedExceptionNames; } } - #endregion - - #region IMessageTransactionExceptionHandler Members - /// /// Called when an exception is thrown during listener processing under the /// scope of a . @@ -116,10 +98,6 @@ public class SendToQueueExceptionHandler : AbstractSendToQueueExceptionHandler, } } - #endregion - - #region Protected Methods - /// /// Determines whether this exception was already processed. /// @@ -155,30 +133,22 @@ public class SendToQueueExceptionHandler : AbstractSendToQueueExceptionHandler, MessageQueue mq = MessageQueueFactory.CreateMessageQueue(MessageQueueObjectName); try { - #region Logging - if (LOG.IsEnabled(LogLevel.Information)) { LOG.LogInformation("Sending message with id = [" + message.Id + "] to queue [" + mq.Path + "]."); } - #endregion - ProcessExceptionalMessage(message); mq.Send(message, messageQueueTransaction); } catch (Exception e) { - #region Logging - if (LOG.IsEnabled(LogLevel.Error)) { string message1 = "Could not send message with id = [" + message.Id + "] to queue [" + mq.Path + "]."; LOG.LogError(e, message1); LOG.LogError("Message will not be processed. Message Body = " + message.Body); } - - #endregion } return TransactionAction.Commit; @@ -200,8 +170,6 @@ public class SendToQueueExceptionHandler : AbstractSendToQueueExceptionHandler, message.CorrelationId = message.Id; } } - - #endregion } internal class MessageStats diff --git a/src/Spring/Spring.Messaging/Messaging/Listener/TransactionAction.cs b/src/Spring/Spring.Messaging/Messaging/Listener/TransactionAction.cs index 35a582de..696cc838 100644 --- a/src/Spring/Spring.Messaging/Messaging/Listener/TransactionAction.cs +++ b/src/Spring/Spring.Messaging/Messaging/Listener/TransactionAction.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Messaging.Listener; /// diff --git a/src/Spring/Spring.Messaging/Messaging/Listener/TransactionalMessageListenerContainer.cs b/src/Spring/Spring.Messaging/Messaging/Listener/TransactionalMessageListenerContainer.cs index 1b918180..1e70100c 100644 --- a/src/Spring/Spring.Messaging/Messaging/Listener/TransactionalMessageListenerContainer.cs +++ b/src/Spring/Spring.Messaging/Messaging/Listener/TransactionalMessageListenerContainer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using Spring.Data.Core; using Spring.Messaging.Core; @@ -115,14 +111,8 @@ namespace Spring.Messaging.Listener; /// public class TransactionalMessageListenerContainer : AbstractTransactionalMessageListenerContainer { - #region Logging Definition - private static readonly ILogger LOG = LogManager.GetLogger(typeof(TransactionalMessageListenerContainer)); - #endregion - - #region Fields - private bool useContainerManagedMessageQueueTransaction = false; private bool useMessageQueueTransactionManagerCalled = false; @@ -131,10 +121,6 @@ public class TransactionalMessageListenerContainer : AbstractTransactionalMessag private IMessageTransactionExceptionHandler messageTransactionExceptionHandler; - #endregion - - #region Properties - /// /// Gets or sets a value indicating whether the MessageListenerContainer should be /// responsible for creating a MessageQueueTransaction @@ -199,10 +185,6 @@ public class TransactionalMessageListenerContainer : AbstractTransactionalMessag set { messageTransactionExceptionHandler = value; } } - #endregion - - #region Public Methods - /// /// Determine if the container should create its own /// MessageQueueTransaction when a IResourceTransactionManager is specified. @@ -241,10 +223,6 @@ public class TransactionalMessageListenerContainer : AbstractTransactionalMessag base.Initialize(); } - #endregion - - #region Protected Methods - /// /// Does the receive and execute using platform transaction manager. /// @@ -295,19 +273,13 @@ public class TransactionalMessageListenerContainer : AbstractTransactionalMessag protected virtual bool DoRecieveAndExecuteUsingMessageQueueTransactionManager(MessageQueue mq, ITransactionStatus status) { - #region Logging - if (LOG.IsEnabled(LogLevel.Debug)) { LOG.LogDebug("Executing DoRecieveAndExecuteUsingMessageQueueTransactionManager"); } - #endregion Logging - Message message; - #region Receive message - try { message = mq.Receive(TimeSpan.Zero, QueueUtils.GetMessageQueueTransaction(null)); @@ -329,16 +301,12 @@ public class TransactionalMessageListenerContainer : AbstractTransactionalMessag { // A real issue in receiving the message - #region Logging - if (LOG.IsEnabled(LogLevel.Error)) { LOG.LogError("Error receiving message from DefaultMessageQueue [" + mq.Path + "], closing queue and clearing connection cache."); } - #endregion - lock (messageQueueMonitor) { mq.Close(); @@ -349,45 +317,31 @@ public class TransactionalMessageListenerContainer : AbstractTransactionalMessag } } - #endregion - if (message == null) { - #region Logging - if (LOG.IsEnabled(LogLevel.Trace)) { LOG.LogTrace("Message recieved is null from Queue = [" + mq.Path + "]"); } - #endregion - status.SetRollbackOnly(); return false; // no more peeking unless this is the last listener thread } try { - #region Logging - if (LOG.IsEnabled(LogLevel.Debug)) { LOG.LogDebug("Received message [" + message.Id + "] on queue [" + mq.Path + "]"); } - #endregion - MessageReceived(message); DoExecuteListener(message); - #region Logging - if (LOG.IsEnabled(LogLevel.Trace)) { LOG.LogTrace("MessageListener executed"); } - - #endregion } catch (Exception ex) { @@ -397,16 +351,12 @@ public class TransactionalMessageListenerContainer : AbstractTransactionalMessag HandleTransactionalListenerException(ex, message, QueueUtils.GetMessageQueueTransaction(null)); if (action == TransactionAction.Rollback) { - #region Logging - if (LOG.IsEnabled(LogLevel.Debug)) { LOG.LogDebug("Exception handler's TransactionAction has rolled back MessageQueueTransaction for queue [" + mq.Path + "]"); } - #endregion - status.SetRollbackOnly(); return false; // no more peeking unless this is the last listener thread } @@ -432,43 +382,29 @@ public class TransactionalMessageListenerContainer : AbstractTransactionalMessag protected virtual bool DoRecieveAndExecuteUsingResourceTransactionManagerWithTxQueue(MessageQueue mq, ITransactionStatus status) { - #region Logging - if (LOG.IsEnabled(LogLevel.Debug)) { LOG.LogDebug("Executing DoRecieveAndExecuteUsingResourceTransactionManagerWithTxQueue"); } - #endregion Logging - using (MessageQueueTransaction messageQueueTransaction = new MessageQueueTransaction()) { messageQueueTransaction.Begin(); - #region Logging - if (LOG.IsEnabled(LogLevel.Trace)) { LOG.LogTrace("Started MessageQueueTransaction for queue = [" + mq.Path + "]"); } - #endregion - Message message; - #region ReceiveMessage - try { - #region Logging - if (LOG.IsEnabled(LogLevel.Trace)) { LOG.LogTrace("Receiving message with zero timeout for queue = [" + mq.Path + "]"); } - #endregion - message = mq.Receive(TimeSpan.Zero, messageQueueTransaction); } catch (MessageQueueException ex) @@ -477,15 +413,11 @@ public class TransactionalMessageListenerContainer : AbstractTransactionalMessag { //expected to occur occasionally - #region Logging - if (LOG.IsEnabled(LogLevel.Trace)) { LOG.LogTrace("MessageQueueErrorCode.IOTimeout: No message available to receive. May have been processed by another thread."); } - #endregion - status.SetRollbackOnly(); return false; // no more peeking unless this is the last listener thread } @@ -493,16 +425,12 @@ public class TransactionalMessageListenerContainer : AbstractTransactionalMessag { // A real issue in receiving the message - #region Logging - if (LOG.IsEnabled(LogLevel.Error)) { LOG.LogError("Error receiving message from DefaultMessageQueue [" + mq.Path + "], closing queue and clearing connection cache."); } - #endregion - lock (messageQueueMonitor) { mq.Close(); @@ -513,34 +441,24 @@ public class TransactionalMessageListenerContainer : AbstractTransactionalMessag } } - #endregion - if (message == null) { - #region Logging - if (LOG.IsEnabled(LogLevel.Trace)) { LOG.LogTrace("Message recieved is null from Queue = [" + mq.Path + "]"); } - #endregion - status.SetRollbackOnly(); return false; // no more peeking unless this is the last listener thread } try { - #region Logging - if (LOG.IsEnabled(LogLevel.Debug)) { LOG.LogDebug("Received message [" + message.Id + "] on queue [" + mq.Path + "]"); } - #endregion - MessageReceived(message); if (ExposeContainerManagedMessageQueueTransaction) @@ -552,25 +470,17 @@ public class TransactionalMessageListenerContainer : AbstractTransactionalMessag DoExecuteListener(message); - #region Logging - if (LOG.IsEnabled(LogLevel.Trace)) { LOG.LogTrace("MessageListener executed"); } - #endregion - messageQueueTransaction.Commit(); - #region Logging - if (LOG.IsEnabled(LogLevel.Trace)) { LOG.LogTrace("Committed MessageQueueTransaction for queue [" + mq.Path + "]"); } - - #endregion } catch (Exception ex) { @@ -580,30 +490,22 @@ public class TransactionalMessageListenerContainer : AbstractTransactionalMessag { messageQueueTransaction.Abort(); - #region Logging - if (LOG.IsEnabled(LogLevel.Debug)) { LOG.LogDebug("Exception handler's TransactionAction has rolled back MessageQueueTransaction for queue [" + mq.Path + "]"); } - - #endregion } else { // Will remove from the message queue messageQueueTransaction.Commit(); - #region Logging - if (LOG.IsEnabled(LogLevel.Debug)) { LOG.LogDebug("Exception handler's TransactionAction has committed MessageQueueTransaction for queue [" + mq.Path + "]"); } - - #endregion } //Outer db-tx will rollback @@ -684,6 +586,4 @@ public class TransactionalMessageListenerContainer : AbstractTransactionalMessag return TransactionAction.Rollback; } } - - #endregion } diff --git a/src/Spring/Spring.Messaging/Messaging/MessagingException.cs b/src/Spring/Spring.Messaging/Messaging/MessagingException.cs index b9bf6319..22fbf92b 100644 --- a/src/Spring/Spring.Messaging/Messaging/MessagingException.cs +++ b/src/Spring/Spring.Messaging/Messaging/MessagingException.cs @@ -9,8 +9,6 @@ namespace Spring.Messaging; [Serializable] public class MessagingException : ApplicationException { - #region Constructor (s) / Destructor - /// Creates a new instance of the MessagingException class. public MessagingException() { @@ -47,6 +45,4 @@ public class MessagingException : ApplicationException : base(info, context) { } - - #endregion } diff --git a/src/Spring/Spring.Messaging/Messaging/Support/Converters/ActiveXMessageConverter.cs b/src/Spring/Spring.Messaging/Messaging/Support/Converters/ActiveXMessageConverter.cs index 0703df67..e1001a94 100644 --- a/src/Spring/Spring.Messaging/Messaging/Support/Converters/ActiveXMessageConverter.cs +++ b/src/Spring/Spring.Messaging/Messaging/Support/Converters/ActiveXMessageConverter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - #if NETSTANDARD using Experimental.System.Messaging; @@ -53,8 +49,6 @@ public class ActiveXMessageConverter : IMessageConverter this.messageFormatter = messageFormatter; } - #region IMessageConverter Members - /// /// Convert the given object to a Message. /// @@ -79,10 +73,6 @@ public class ActiveXMessageConverter : IMessageConverter return message.Body; } - #endregion - - #region ICloneable Members - /// /// Creates a new object that is a copy of the current instance. /// @@ -94,6 +84,4 @@ public class ActiveXMessageConverter : IMessageConverter ActiveXMessageConverter mc = new ActiveXMessageConverter(messageFormatter.Clone() as ActiveXMessageFormatter); return mc; } - - #endregion } diff --git a/src/Spring/Spring.Messaging/Messaging/Support/Converters/BinaryMessageConverter.cs b/src/Spring/Spring.Messaging/Messaging/Support/Converters/BinaryMessageConverter.cs index f4a48139..d7ac1876 100644 --- a/src/Spring/Spring.Messaging/Messaging/Support/Converters/BinaryMessageConverter.cs +++ b/src/Spring/Spring.Messaging/Messaging/Support/Converters/BinaryMessageConverter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization.Formatters; #if NETSTANDARD @@ -84,8 +80,6 @@ public class BinaryMessageConverter : IMessageConverter } } - #region IMessageConverter Members - /// /// Convert the given object to a Message using the /// @@ -110,10 +104,6 @@ public class BinaryMessageConverter : IMessageConverter return message.Body; } - #endregion - - #region ICloneable Members - /// /// Creates a new object that is a copy of the current instance. /// @@ -126,6 +116,4 @@ public class BinaryMessageConverter : IMessageConverter BinaryMessageConverter mc = new BinaryMessageConverter(binaryMessageFormatter.Clone() as BinaryMessageFormatter); return mc; } - - #endregion } \ No newline at end of file diff --git a/src/Spring/Spring.Messaging/Messaging/Support/Converters/IMessageConverter.cs b/src/Spring/Spring.Messaging/Messaging/Support/Converters/IMessageConverter.cs index 2d2cac2c..bc9a1eb4 100644 --- a/src/Spring/Spring.Messaging/Messaging/Support/Converters/IMessageConverter.cs +++ b/src/Spring/Spring.Messaging/Messaging/Support/Converters/IMessageConverter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - #if NETSTANDARD using Experimental.System.Messaging; diff --git a/src/Spring/Spring.Messaging/Messaging/Support/Converters/MessageConverterCreatorDelegate.cs b/src/Spring/Spring.Messaging/Messaging/Support/Converters/MessageConverterCreatorDelegate.cs index 369787ba..ca2d05a2 100644 --- a/src/Spring/Spring.Messaging/Messaging/Support/Converters/MessageConverterCreatorDelegate.cs +++ b/src/Spring/Spring.Messaging/Messaging/Support/Converters/MessageConverterCreatorDelegate.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Messaging.Core; namespace Spring.Messaging.Support.Converters; diff --git a/src/Spring/Spring.Messaging/Messaging/Support/Converters/MessageConverterFactoryObject.cs b/src/Spring/Spring.Messaging/Messaging/Support/Converters/MessageConverterFactoryObject.cs index 5d8b62d4..32f08a1e 100644 --- a/src/Spring/Spring.Messaging/Messaging/Support/Converters/MessageConverterFactoryObject.cs +++ b/src/Spring/Spring.Messaging/Messaging/Support/Converters/MessageConverterFactoryObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects.Factory.Config; namespace Spring.Messaging.Support.Converters; @@ -39,8 +35,6 @@ internal class MessageConverterFactoryObject : IConfigurableFactoryObject set { messageConverterCreatorDelegate = value; } } - #region IConfigurableFactoryObject Members - /// /// Gets the template object definition that should be used /// to configure the instance of the object managed by this factory. @@ -52,10 +46,6 @@ internal class MessageConverterFactoryObject : IConfigurableFactoryObject set { productTemplate = value; } } - #endregion - - #region IFactoryObject Members - public object GetObject() { return MessageConverterCreatorDelegate(); @@ -70,6 +60,4 @@ internal class MessageConverterFactoryObject : IConfigurableFactoryObject { get { return false; } } - - #endregion } diff --git a/src/Spring/Spring.Messaging/Messaging/Support/Converters/XmlDocumentConverter.cs b/src/Spring/Spring.Messaging/Messaging/Support/Converters/XmlDocumentConverter.cs index 8a8dbec4..ad54b425 100644 --- a/src/Spring/Spring.Messaging/Messaging/Support/Converters/XmlDocumentConverter.cs +++ b/src/Spring/Spring.Messaging/Messaging/Support/Converters/XmlDocumentConverter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Xml; #if NETSTANDARD @@ -36,8 +32,6 @@ namespace Spring.Messaging.Support.Converters; /// Mark Pollack public class XmlDocumentConverter : IMessageConverter { - #region IMessageConverter Members - /// /// Convert the given object to a Message. /// @@ -70,10 +64,6 @@ public class XmlDocumentConverter : IMessageConverter return doc; } - #endregion - - #region ICloneable Members - /// /// Creates a new object that is a copy of the current instance. /// @@ -84,6 +74,4 @@ public class XmlDocumentConverter : IMessageConverter { return new XmlDocumentConverter(); } - - #endregion } \ No newline at end of file diff --git a/src/Spring/Spring.Messaging/Messaging/Support/Converters/XmlMessageConverter.cs b/src/Spring/Spring.Messaging/Messaging/Support/Converters/XmlMessageConverter.cs index 875d0c4c..431f2e00 100644 --- a/src/Spring/Spring.Messaging/Messaging/Support/Converters/XmlMessageConverter.cs +++ b/src/Spring/Spring.Messaging/Messaging/Support/Converters/XmlMessageConverter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Util; #if NETSTANDARD @@ -83,8 +79,6 @@ public class XmlMessageConverter : IMessageConverter get { return messageFormatter.TargetTypeNames; } } - #region IMessageConverter Members - /// /// Convert the given object to a Message. /// @@ -109,10 +103,6 @@ public class XmlMessageConverter : IMessageConverter return message.Body; } - #endregion - - #region ICloneable Members - /// /// Creates a new object that is a copy of the current instance. /// @@ -124,6 +114,4 @@ public class XmlMessageConverter : IMessageConverter XmlMessageConverter mc = new XmlMessageConverter(messageFormatter.Clone() as XmlMessageFormatter); return mc; } - - #endregion } diff --git a/src/Spring/Spring.Messaging/Messaging/Support/MessageQueueFactoryObject.cs b/src/Spring/Spring.Messaging/Messaging/Support/MessageQueueFactoryObject.cs index 5f3bc8b8..f38f062c 100644 --- a/src/Spring/Spring.Messaging/Messaging/Support/MessageQueueFactoryObject.cs +++ b/src/Spring/Spring.Messaging/Messaging/Support/MessageQueueFactoryObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects.Factory; using Spring.Objects.Factory.Config; @@ -187,8 +183,6 @@ public class MessageQueueFactoryObject : IConfigurableFactoryObject, IObjectName set { remoteQueueIsTransactional = value; } } - #region IFactoryObject Members - /// /// Retrun a configured MessageQueue object. /// @@ -236,8 +230,6 @@ public class MessageQueueFactoryObject : IConfigurableFactoryObject, IObjectName get { return false; } } - #region IConfigurableFactoryObject Members - /// /// Gets the template object definition that should be used /// to configure the instance of the object managed by this factory. @@ -249,10 +241,6 @@ public class MessageQueueFactoryObject : IConfigurableFactoryObject, IObjectName set { productTemplate = value; } } - #endregion - - #endregion - /// /// Set the name of the object in the object factory that created this object. /// diff --git a/src/Spring/Spring.Scheduling.Quartz3/Scheduling/Quartz/IThreadRunnable.cs b/src/Spring/Spring.Scheduling.Quartz3/Scheduling/Quartz/IThreadRunnable.cs index ed576aaa..b649b786 100644 --- a/src/Spring/Spring.Scheduling.Quartz3/Scheduling/Quartz/IThreadRunnable.cs +++ b/src/Spring/Spring.Scheduling.Quartz3/Scheduling/Quartz/IThreadRunnable.cs @@ -1,6 +1,4 @@ -#region License - -// /* +// /* // * Copyright 2018 the original author or authors. // * // * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ // * limitations under the License. // */ -#endregion - namespace Spring.Scheduling.Quartz; /// diff --git a/src/Spring/Spring.Services/EnterpriseServices/EnterpriseServicesExporter.cs b/src/Spring/Spring.Services/EnterpriseServices/EnterpriseServicesExporter.cs index 512803b4..70bf7348 100644 --- a/src/Spring/Spring.Services/EnterpriseServices/EnterpriseServicesExporter.cs +++ b/src/Spring/Spring.Services/EnterpriseServices/EnterpriseServicesExporter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Diagnostics; using System.EnterpriseServices; @@ -112,8 +108,6 @@ namespace Spring.EnterpriseServices; /// Erich Eichinger public class EnterpriseServicesExporter : IInitializingObject, IObjectFactoryAware { - #region Fields - private IObjectFactory objectFactory; private IList components = new ArrayList(); @@ -127,10 +121,6 @@ public class EnterpriseServicesExporter : IInitializingObject, IObjectFactoryAwa private string assemblyName; private bool useSpring; - #endregion - - #region Constructor(s) / Destructor - /// /// Creates new enterprise services exporter. /// @@ -138,10 +128,6 @@ public class EnterpriseServicesExporter : IInitializingObject, IObjectFactoryAwa { } - #endregion - - #region Properties - /// /// Gets or sets list of components to export. /// @@ -232,10 +218,6 @@ public class EnterpriseServicesExporter : IInitializingObject, IObjectFactoryAwa set { useSpring = value; } } - #endregion - - #region IInitializingObject Members - /// /// Called by Spring container after object is configured in order to initialize it. /// @@ -249,10 +231,6 @@ public class EnterpriseServicesExporter : IInitializingObject, IObjectFactoryAwa Export(); } - #endregion - - #region IObjectFactoryAware Members - /// /// Sets object factory instance. /// @@ -261,10 +239,6 @@ public class EnterpriseServicesExporter : IInitializingObject, IObjectFactoryAwa set { objectFactory = value; } } - #endregion - - #region Public Methods - /// /// Creates ServicedComponent wrappers for the specified components and registers /// them with COM+ Component Services. @@ -361,10 +335,6 @@ public class EnterpriseServicesExporter : IInitializingObject, IObjectFactoryAwa regHelper.UninstallAssemblyFromConfig(ref config); } - #endregion - - #region Private Methods - /// /// Reads key pair from embedded resource. /// @@ -455,10 +425,6 @@ public class EnterpriseServicesExporter : IInitializingObject, IObjectFactoryAwa return role; } - #endregion - - #region SpringServicedComponent generation - /// /// Creates the SpringServicedComponent base class to derive all s from. /// @@ -606,6 +572,4 @@ public class EnterpriseServicesExporter : IInitializingObject, IObjectFactoryAwa mb3.SetImplementationFlags(MethodImplAttributes.Managed | MethodImplAttributes.Runtime); return typeBuilder.CreateType(); } - - #endregion } diff --git a/src/Spring/Spring.Services/EnterpriseServices/ExeConfigurationSystem.cs b/src/Spring/Spring.Services/EnterpriseServices/ExeConfigurationSystem.cs index 0467c827..5e4e33ef 100644 --- a/src/Spring/Spring.Services/EnterpriseServices/ExeConfigurationSystem.cs +++ b/src/Spring/Spring.Services/EnterpriseServices/ExeConfigurationSystem.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.EnterpriseServices; using System; diff --git a/src/Spring/Spring.Services/EnterpriseServices/ServicedComponentExporter.cs b/src/Spring/Spring.Services/EnterpriseServices/ServicedComponentExporter.cs index a353fa07..079f0b60 100644 --- a/src/Spring/Spring.Services/EnterpriseServices/ServicedComponentExporter.cs +++ b/src/Spring/Spring.Services/EnterpriseServices/ServicedComponentExporter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.EnterpriseServices; using System.Reflection; @@ -45,18 +41,12 @@ namespace Spring.EnterpriseServices; /// Erich Eichinger public class ServicedComponentExporter : IInitializingObject, IObjectNameAware { - #region Fields - private string _objectName; private string _targetName; private string[] _interfaces; private IList _typeAttributes = new ArrayList(); private IDictionary _memberAttributes = new Hashtable(); - #endregion - - #region Constructor(s) / Destructor - /// /// Creates a new instance of the /// class. @@ -65,10 +55,6 @@ public class ServicedComponentExporter : IInitializingObject, IObjectNameAware { } - #endregion - - #region Properties - /// /// Gets or sets name of the target object that should be exposed as a serviced component. /// @@ -116,10 +102,6 @@ public class ServicedComponentExporter : IInitializingObject, IObjectNameAware set { _memberAttributes = value; } } - #endregion - - #region IInitializingObject Members - /// /// Validate configuration. /// @@ -128,10 +110,6 @@ public class ServicedComponentExporter : IInitializingObject, IObjectNameAware ValidateConfiguration(); } - #endregion - - #region IObjectNameAware Members - /// /// Set the name of the object in the object factory /// that created this object. @@ -141,10 +119,6 @@ public class ServicedComponentExporter : IInitializingObject, IObjectNameAware set { _objectName = value; } } - #endregion - - #region Methods - private void ValidateConfiguration() { if (TargetName == null) @@ -216,10 +190,6 @@ public class ServicedComponentExporter : IInitializingObject, IObjectNameAware return componentType; } - #endregion - - #region ServicedComponentProxyTypeBuilder inner class definition - private class ServicedComponentTargetProxyMethodBuilder : TargetProxyMethodBuilder { public ServicedComponentTargetProxyMethodBuilder(TypeBuilder typeBuilder, IProxyTypeGenerator proxyGenerator, bool explicitImplementation) : base(typeBuilder, proxyGenerator, explicitImplementation) @@ -265,45 +235,27 @@ public class ServicedComponentExporter : IInitializingObject, IObjectNameAware { private readonly ModuleBuilder module; - #region Constructor(s) / Destructor - public SimpleServicedComponentProxyTypeBuilder(ModuleBuilder module, Type baseType) { this.module = module; BaseType = baseType; } - #endregion - - #region Protected Methods - protected override TypeBuilder CreateTypeBuilder(string name, Type baseType) { return module.DefineType(name, System.Reflection.TypeAttributes.Public, baseType); } - - #endregion } private sealed class SpringManagedServicedComponentProxyTypeBuilder : ServicedComponentProxyTypeBuilder { - #region Fields - private delegate object GetTargetDelegate(ServicedComponent component, string name); private static readonly MethodInfo ServicedComponentExporter_GetTarget = new GetTargetDelegate(ServicedComponentHelper.GetObject).Method; - #endregion - - #region Fields - private readonly ServicedComponentExporter exporter; private readonly ModuleBuilder module; - #endregion - - #region Constructor(s) / Destructor - public SpringManagedServicedComponentProxyTypeBuilder(ModuleBuilder module, Type baseType, ServicedComponentExporter exporter) { this.module = module; @@ -311,10 +263,6 @@ public class ServicedComponentExporter : IInitializingObject, IObjectNameAware BaseType = baseType; } - #endregion - - #region Protected Methods - protected override TypeBuilder CreateTypeBuilder(string name, Type baseType) { return module.DefineType(name, System.Reflection.TypeAttributes.Public, baseType); @@ -325,10 +273,6 @@ public class ServicedComponentExporter : IInitializingObject, IObjectNameAware //base.DeclareTargetInstanceField(builder); } - #endregion - - #region IProxyTypeGenerator Members - /// /// Generates the IL instructions that pushes /// the target instance on which calls should be delegated to. @@ -342,9 +286,5 @@ public class ServicedComponentExporter : IInitializingObject, IObjectNameAware il.Emit(OpCodes.Ldstr, this.exporter.TargetName); il.Emit(OpCodes.Callvirt, getObjectRef.FieldType.GetMethod("Invoke")); } - - #endregion } - - #endregion } diff --git a/src/Spring/Spring.Services/EnterpriseServices/ServicedComponentFactory.cs b/src/Spring/Spring.Services/EnterpriseServices/ServicedComponentFactory.cs index b64d2c19..14ab24ea 100644 --- a/src/Spring/Spring.Services/EnterpriseServices/ServicedComponentFactory.cs +++ b/src/Spring/Spring.Services/EnterpriseServices/ServicedComponentFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - #if !MONO using System.Reflection; @@ -38,8 +34,6 @@ namespace Spring.EnterpriseServices; /// Aleksandar Seovic public class ServicedComponentFactory : IConfigurableFactoryObject, IInitializingObject { - #region Fields - private string name; private string server; @@ -49,10 +43,6 @@ public class ServicedComponentFactory : IConfigurableFactoryObject, IInitializin private Type componentType; private object singletonInstance; - #endregion - - #region Constructor(s) / Destructor - /// /// Creates new instance of serviced component factory. /// @@ -61,10 +51,6 @@ public class ServicedComponentFactory : IConfigurableFactoryObject, IInitializin this.isSingleton = false; } - #endregion - - #region Properties - /// /// Gets or sets component name, as registered with COM+ Services. /// @@ -83,10 +69,6 @@ public class ServicedComponentFactory : IConfigurableFactoryObject, IInitializin set { server = value; } } - #endregion - - #region IConfigurableFactoryObject Members - /// /// Returns configured instance of the serviced component. /// @@ -135,10 +117,6 @@ public class ServicedComponentFactory : IConfigurableFactoryObject, IInitializin set { productTemplate = value; } } - #endregion - - #region IInitializingObject Members - /// /// Initializes factory object. /// @@ -149,10 +127,6 @@ public class ServicedComponentFactory : IConfigurableFactoryObject, IInitializin AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve; } - #endregion - - #region Private Methods - private void ValidateConfiguration() { if (Name == null) @@ -174,8 +148,6 @@ public class ServicedComponentFactory : IConfigurableFactoryObject, IInitializin { return Assembly.LoadFrom(componentType.Assembly.CodeBase); } - - #endregion } #endif // !MONO diff --git a/src/Spring/Spring.Services/EnterpriseServices/ServicedComponentHelper.cs b/src/Spring/Spring.Services/EnterpriseServices/ServicedComponentHelper.cs index 4e66c8dd..d54c6b58 100644 --- a/src/Spring/Spring.Services/EnterpriseServices/ServicedComponentHelper.cs +++ b/src/Spring/Spring.Services/EnterpriseServices/ServicedComponentHelper.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Diagnostics; using System.EnterpriseServices; using System.Reflection; diff --git a/src/Spring/Spring.Services/Remoting/CaoExporter.cs b/src/Spring/Spring.Services/Remoting/CaoExporter.cs index f9ee7069..bac5429c 100644 --- a/src/Spring/Spring.Services/Remoting/CaoExporter.cs +++ b/src/Spring/Spring.Services/Remoting/CaoExporter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Remoting; using Microsoft.Extensions.Logging; using Spring.Context; @@ -36,14 +32,8 @@ namespace Spring.Remoting; /// Bruno Baia public class CaoExporter : ConfigurableLifetime, IApplicationContextAware, IObjectFactoryAware, IInitializingObject, IDisposable { - #region Logging - private static readonly ILogger LOG = LogManager.GetLogger(); - #endregion - - #region Fields - private string targetName; private string[] interfaces; @@ -52,10 +42,6 @@ public class CaoExporter : ConfigurableLifetime, IApplicationContextAware, IObje private CaoRemoteFactory remoteFactory; - #endregion - - #region Constructor(s) / Destructor - /// /// Creates a new instance of the class. /// @@ -63,10 +49,6 @@ public class CaoExporter : ConfigurableLifetime, IApplicationContextAware, IObje { } - #endregion - - #region Properties - /// /// Gets or sets the name of the target object definition. /// @@ -90,10 +72,6 @@ public class CaoExporter : ConfigurableLifetime, IApplicationContextAware, IObje set { interfaces = value; } } - #endregion - - #region IApplicationContextAware Members - /// /// Sets the that this /// object runs in. @@ -126,10 +104,6 @@ public class CaoExporter : ConfigurableLifetime, IApplicationContextAware, IObje set { applicationContext = value; } } - #endregion - - #region IObjectFactoryAware Members - /// /// Sets object factory to use. /// @@ -138,10 +112,6 @@ public class CaoExporter : ConfigurableLifetime, IApplicationContextAware, IObje set { objectFactory = (AbstractObjectFactory) value; } } - #endregion - - #region IInitializingObject Members - /// /// Publish the object /// @@ -151,10 +121,6 @@ public class CaoExporter : ConfigurableLifetime, IApplicationContextAware, IObje Export(); } - #endregion - - #region IDisposable Members - /// /// Disconnect the remote object from the registered remoting channels. /// @@ -163,10 +129,6 @@ public class CaoExporter : ConfigurableLifetime, IApplicationContextAware, IObje RemotingServices.Disconnect(remoteFactory); } - #endregion - - #region Private Methods - private void ValidateConfiguration() { if (TargetName == null) @@ -181,52 +143,30 @@ public class CaoExporter : ConfigurableLifetime, IApplicationContextAware, IObje RemotingServices.Marshal(remoteFactory, targetName); - #region Instrumentation - if (LOG.IsEnabled(LogLevel.Debug)) { LOG.LogDebug(String.Format("Target '{0}' registered.", targetName)); } - - #endregion } - #endregion - - #region BaseCao inner class definition - /// /// This class extends to allow CAOs /// to be disconnect from the client. /// public abstract class BaseCao : BaseRemoteObject, IDisposable { - #region IDisposable Members - void IDisposable.Dispose() { RemotingServices.Disconnect(this); } - - #endregion } - #endregion - - #region CaoRemoteFactory inner class definition - private sealed class CaoRemoteFactory : MarshalByRefObject, ICaoRemoteFactory { - #region Fields - private AbstractObjectFactory objectFactory; private string targetName; private RemoteObjectFactory remoteObjectFactory; - #endregion - - #region Constructor(s) / Destructor - /// /// Create a new instance of the RemoteFactory. /// @@ -245,10 +185,6 @@ public class CaoExporter : ConfigurableLifetime, IApplicationContextAware, IObje this.remoteObjectFactory.SponsorshipTimeout = lifetime.SponsorshipTimeout; } - #endregion - - #region Membres de ICaoRemoteFactory - /// /// Returns the CAO proxy. /// @@ -287,10 +223,6 @@ public class CaoExporter : ConfigurableLifetime, IApplicationContextAware, IObje return remoteObjectFactory.GetObject(); } - #endregion - - #region Overrided Methods - /// /// Set infinite lifetime. /// @@ -298,9 +230,5 @@ public class CaoExporter : ConfigurableLifetime, IApplicationContextAware, IObje { return null; } - - #endregion } - - #endregion } diff --git a/src/Spring/Spring.Services/Remoting/CaoFactoryObject.cs b/src/Spring/Spring.Services/Remoting/CaoFactoryObject.cs index 5a4b1103..365db99e 100644 --- a/src/Spring/Spring.Services/Remoting/CaoFactoryObject.cs +++ b/src/Spring/Spring.Services/Remoting/CaoFactoryObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using Spring.Objects.Factory; using Spring.Remoting.Support; @@ -33,22 +29,12 @@ namespace Spring.Remoting; /// Bruno Baia public class CaoFactoryObject : IFactoryObject, IInitializingObject { - #region Logging - private static readonly ILogger LOG = LogManager.GetLogger(); - #endregion - - #region Fields - private string remoteTargetName; private string serviceUrl; private object[] constructorArguments; - #endregion - - #region Properties - /// /// The remote target name to activate. /// @@ -76,10 +62,6 @@ public class CaoFactoryObject : IFactoryObject, IInitializingObject set { constructorArguments = value; } } - #endregion - - #region Constructor(s) / Destructor - /// /// Creates a new instance of the class. /// @@ -87,10 +69,6 @@ public class CaoFactoryObject : IFactoryObject, IInitializingObject { } - #endregion - - #region IInitializingObject Members - /// /// Callback method called once all factory properties have been set. /// @@ -108,10 +86,6 @@ public class CaoFactoryObject : IFactoryObject, IInitializingObject } } - #endregion - - #region IFactoryObject Members - /// /// Always return false. /// @@ -151,6 +125,4 @@ public class CaoFactoryObject : IFactoryObject, IInitializingObject return remoteFactory.GetObject(); } } - - #endregion } diff --git a/src/Spring/Spring.Services/Remoting/Config/RemotingNamespaceParser.cs b/src/Spring/Spring.Services/Remoting/Config/RemotingNamespaceParser.cs index 0fa93917..9c79f329 100644 --- a/src/Spring/Spring.Services/Remoting/Config/RemotingNamespaceParser.cs +++ b/src/Spring/Spring.Services/Remoting/Config/RemotingNamespaceParser.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Xml; using Spring.Core.TypeResolution; using Spring.Objects; @@ -430,8 +426,6 @@ public sealed class RemotingNamespaceParser : ObjectsNamespaceParser return typeName; } - #region Element & Attribute Name Constants - private class RemotingConfigurerConstants { public const string RemotingConfigurerElement = "configurer"; @@ -490,6 +484,4 @@ public sealed class RemotingNamespaceParser : ObjectsNamespaceParser public const string TargetNameAttribute = "targetName"; public const string InfiniteAttribute = "infinite"; } - - #endregion } \ No newline at end of file diff --git a/src/Spring/Spring.Services/Remoting/RemoteObjectFactory.cs b/src/Spring/Spring.Services/Remoting/RemoteObjectFactory.cs index 1eb98a6d..73b8eea0 100644 --- a/src/Spring/Spring.Services/Remoting/RemoteObjectFactory.cs +++ b/src/Spring/Spring.Services/Remoting/RemoteObjectFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using Spring.Proxy; using Spring.Objects.Factory; @@ -32,18 +28,12 @@ namespace Spring.Remoting; /// Bruno Baia public class RemoteObjectFactory : ConfigurableLifetime, IInitializingObject, IFactoryObject { - #region Fields - private object target; private Type baseType = typeof(BaseRemoteObject); private string[] interfaces; private ConstructorInfo proxyConstructor; - #endregion - - #region Constructor(s) / Destructor - /// /// Creates a new instance of the MarshalByRefObjectFactory. /// @@ -51,10 +41,6 @@ public class RemoteObjectFactory : ConfigurableLifetime, IInitializingObject, IF { } - #endregion - - #region Properties - /// /// Gets or sets the target object. /// @@ -88,10 +74,6 @@ public class RemoteObjectFactory : ConfigurableLifetime, IInitializingObject, IF set { interfaces = value; } } - #endregion - - #region IInitializingObject Members - /// /// Initializes factory object. /// @@ -101,10 +83,6 @@ public class RemoteObjectFactory : ConfigurableLifetime, IInitializingObject, IF GenerateProxy(); } - #endregion - - #region IFactoryObject Members - /// /// Returns type of the remotable target proxy. /// @@ -139,10 +117,6 @@ public class RemoteObjectFactory : ConfigurableLifetime, IInitializingObject, IF } } - #endregion - - #region Private Methods - private void ValidateConfiguration() { if (Target == null) @@ -170,6 +144,4 @@ public class RemoteObjectFactory : ConfigurableLifetime, IInitializingObject, IF proxyConstructor = remotableObjectType.GetConstructor(new Type[1] { builder.TargetType }); } - - #endregion } diff --git a/src/Spring/Spring.Services/Remoting/RemotingConfigurer.cs b/src/Spring/Spring.Services/Remoting/RemotingConfigurer.cs index 59ef04de..186c4c83 100644 --- a/src/Spring/Spring.Services/Remoting/RemotingConfigurer.cs +++ b/src/Spring/Spring.Services/Remoting/RemotingConfigurer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Remoting; using Microsoft.Extensions.Logging; using Spring.Core; @@ -32,8 +28,6 @@ namespace Spring.Remoting; /// Bruno Baia public class RemotingConfigurer : IObjectFactoryPostProcessor, IOrdered { - #region Fields - private static readonly ILogger log = LogManager.GetLogger(); private int _order = Int32.MinValue; @@ -42,10 +36,6 @@ public class RemotingConfigurer : IObjectFactoryPostProcessor, IOrdered private bool _useConfigFile = true; private bool _ensureSecurity = false; - #endregion - - #region Constructor(s) / Destructor - /// /// Initializes a new instance of the class. /// @@ -53,10 +43,6 @@ public class RemotingConfigurer : IObjectFactoryPostProcessor, IOrdered { } - #endregion - - #region Properties - /// /// Gets or sets the name of the remoting configuration file. /// @@ -95,10 +81,6 @@ public class RemotingConfigurer : IObjectFactoryPostProcessor, IOrdered set { _ensureSecurity = value; } } - #endregion - - #region IObjectFactoryPostProcessor Members - /// /// Modify the application context's internal object factory after its /// standard initialization. @@ -119,8 +101,6 @@ public class RemotingConfigurer : IObjectFactoryPostProcessor, IOrdered RemotingConfiguration.Configure(filename, EnsureSecurity); - #region Instrumentation - if (log.IsEnabled(LogLevel.Debug)) { if (filename == null) @@ -132,14 +112,8 @@ public class RemotingConfigurer : IObjectFactoryPostProcessor, IOrdered log.LogDebug(String.Format("Remoting infrastructure configured using file '{0}'.", filename)); } } - - #endregion } - #endregion - - #region IOrdered Members - /// /// Return the order value of this object, /// where a higher value means greater in terms of sorting. @@ -148,6 +122,4 @@ public class RemotingConfigurer : IObjectFactoryPostProcessor, IOrdered { get { return _order; } } - - #endregion } diff --git a/src/Spring/Spring.Services/Remoting/SaoExporter.cs b/src/Spring/Spring.Services/Remoting/SaoExporter.cs index 19ff08b0..f4c7ee19 100644 --- a/src/Spring/Spring.Services/Remoting/SaoExporter.cs +++ b/src/Spring/Spring.Services/Remoting/SaoExporter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Reflection; using System.Reflection.Emit; @@ -46,12 +42,8 @@ namespace Spring.Remoting; /// Erich Eichinger public class SaoExporter : ConfigurableLifetime, IObjectFactoryAware, IInitializingObject, IDisposable { - #region Logging - private static readonly ILogger LOG = LogManager.GetLogger(typeof(SaoExporter)); - #endregion - /// /// Holds EXPORTER_ID to SaoExporter instance mappings. /// @@ -76,8 +68,6 @@ public class SaoExporter : ConfigurableLifetime, IObjectFactoryAware, IInitializ return target; } - #region Fields - private readonly string EXPORTER_ID = Guid.NewGuid().ToString(); private string targetName; private string applicationName; @@ -87,10 +77,6 @@ public class SaoExporter : ConfigurableLifetime, IObjectFactoryAware, IInitializ private IObjectFactory objectFactory; private MarshalByRefObject remoteObject; - #endregion - - #region Constructor(s) / Destructor - /// /// Creates a new instance of the class. /// @@ -110,10 +96,6 @@ public class SaoExporter : ConfigurableLifetime, IObjectFactoryAware, IInitializ Dispose(false); } - #endregion - - #region Properties - /// /// Gets or sets the name of the target object definition. /// @@ -160,10 +142,6 @@ public class SaoExporter : ConfigurableLifetime, IObjectFactoryAware, IInitializ set { interfaces = value; } } - #endregion - - #region IObjectFactoryAware Members - /// /// Sets object factory to use. /// @@ -172,10 +150,6 @@ public class SaoExporter : ConfigurableLifetime, IObjectFactoryAware, IInitializ set { objectFactory = value; } } - #endregion - - #region IInitializingObject Members - /// /// Publish the object /// @@ -185,10 +159,6 @@ public class SaoExporter : ConfigurableLifetime, IObjectFactoryAware, IInitializ Export(); } - #endregion - - #region IDisposable Members - /// /// Disconnect the remote object from the registered remoting channels. /// @@ -217,10 +187,6 @@ public class SaoExporter : ConfigurableLifetime, IObjectFactoryAware, IInitializ } } - #endregion - - #region Private Methods - private object GetTargetInstance() { return objectFactory.GetObject(targetName); @@ -278,20 +244,12 @@ public class SaoExporter : ConfigurableLifetime, IObjectFactoryAware, IInitializ RemotingServices.Marshal(remoteObject, objectUri); - #region Instrumentation - if (LOG.IsEnabled(LogLevel.Debug)) { LOG.LogDebug(String.Format("Target '{0}' exported as '{1}'.", targetName, objectUri)); } - - #endregion } - #endregion - - #region SaoRemoteObjectProxyTypeBuilder inner class definition - /// /// Builds a proxy type based on to wrap a target object /// that is intended to be remotable. @@ -301,16 +259,10 @@ public class SaoExporter : ConfigurableLifetime, IObjectFactoryAware, IInitializ /// private sealed class SaoRemoteObjectProxyTypeBuilder : RemoteObjectProxyTypeBuilder { - #region Fields - private static readonly MethodInfo SaoExporter_GetTargetInstance = typeof(SaoExporter).GetMethod("GetTarget", new Type[] { typeof(string) }); private SaoExporter _saoExporter; - #endregion - - #region Constructor(s) / Destructor - /// /// Creates a new instance of the /// class. @@ -327,10 +279,6 @@ public class SaoExporter : ConfigurableLifetime, IObjectFactoryAware, IInitializ BaseType = typeof(BaseRemoteObject); } - #endregion - - #region IProxyTypeGenerator Members - /// /// Generates the IL instructions that pushes /// the target instance on which calls should be delegated to. @@ -342,10 +290,6 @@ public class SaoExporter : ConfigurableLifetime, IObjectFactoryAware, IInitializ il.Emit(OpCodes.Call, SaoExporter_GetTargetInstance); } - #endregion - - #region Protected Methods - /// /// Implements constructors for the proxy class. /// @@ -374,9 +318,5 @@ public class SaoExporter : ConfigurableLifetime, IObjectFactoryAware, IInitializ protected override void DeclareTargetInstanceField(TypeBuilder builder) { } - - #endregion } - - #endregion } diff --git a/src/Spring/Spring.Services/Remoting/SaoFactoryObject.cs b/src/Spring/Spring.Services/Remoting/SaoFactoryObject.cs index 0b7c09d9..69a5a4f3 100644 --- a/src/Spring/Spring.Services/Remoting/SaoFactoryObject.cs +++ b/src/Spring/Spring.Services/Remoting/SaoFactoryObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects.Factory; namespace Spring.Remoting; @@ -37,15 +33,9 @@ namespace Spring.Remoting; /// Bruno Baia public class SaoFactoryObject : IFactoryObject, IInitializingObject { - #region Fields - private Type serviceInterface; private string serviceUrl; - #endregion - - #region Properties - /// /// The remote service interface. /// @@ -64,10 +54,6 @@ public class SaoFactoryObject : IFactoryObject, IInitializingObject set { serviceUrl = value; } } - #endregion - - #region Constructor(s) / Destructor - /// /// Creates a new instance of the SaoFactoryObject class. /// @@ -75,10 +61,6 @@ public class SaoFactoryObject : IFactoryObject, IInitializingObject { } - #endregion - - #region IInitializingObject Members - /// /// Callback method called once all factory properties have been set. /// @@ -101,10 +83,6 @@ public class SaoFactoryObject : IFactoryObject, IInitializingObject } } - #endregion - - #region IFactoryObject Members - /// /// Is the object managed by this factory a singleton or a prototype? /// @@ -129,6 +107,4 @@ public class SaoFactoryObject : IFactoryObject, IInitializingObject { return Activator.GetObject(serviceInterface, serviceUrl); } - - #endregion } \ No newline at end of file diff --git a/src/Spring/Spring.Services/Remoting/Support/BaseRemoteObject.cs b/src/Spring/Spring.Services/Remoting/Support/BaseRemoteObject.cs index 5372dc82..970de7df 100644 --- a/src/Spring/Spring.Services/Remoting/Support/BaseRemoteObject.cs +++ b/src/Spring/Spring.Services/Remoting/Support/BaseRemoteObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Remoting.Lifetime; namespace Spring.Remoting.Support; @@ -36,17 +32,11 @@ namespace Spring.Remoting.Support; /// Aleksandar Seovic public abstract class BaseRemoteObject : MarshalByRefObject { - #region Fields - private bool isInfinite = false; private TimeSpan initialLeaseTime = TimeSpan.Zero; private TimeSpan renewOnCallTime = TimeSpan.Zero; private TimeSpan sponsorshipTimeout = TimeSpan.Zero; - #endregion - - #region Constructor(s) / Destructor - /// /// Initializes a new instance of the class. /// @@ -54,10 +44,6 @@ public abstract class BaseRemoteObject : MarshalByRefObject { } - #endregion - - #region Properties - /// /// Gets or sets a value indicating whether this instance has infinite lifetime. /// @@ -105,10 +91,6 @@ public abstract class BaseRemoteObject : MarshalByRefObject set { sponsorshipTimeout = value; } } - #endregion - - #region Methods - /// /// Obtains a lifetime service object to control the lifetime policy for this instance. /// @@ -155,6 +137,4 @@ public abstract class BaseRemoteObject : MarshalByRefObject return lease; } - - #endregion } diff --git a/src/Spring/Spring.Services/Remoting/Support/ConfigurableLifetime.cs b/src/Spring/Spring.Services/Remoting/Support/ConfigurableLifetime.cs index 51e0fc67..33585936 100644 --- a/src/Spring/Spring.Services/Remoting/Support/ConfigurableLifetime.cs +++ b/src/Spring/Spring.Services/Remoting/Support/ConfigurableLifetime.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Remoting.Support; /// @@ -26,17 +22,11 @@ namespace Spring.Remoting.Support; /// Bruno Baia public class ConfigurableLifetime : ILifetime { - #region Fields - private bool infinite = true; private TimeSpan initialLeaseTime = TimeSpan.Zero; private TimeSpan renewOnCallTime = TimeSpan.Zero; private TimeSpan sponsorshipTimeout = TimeSpan.Zero; - #endregion - - #region ILifetime Members - /// /// Gets or sets a value indicating whether this instance has infinite lifetime. /// @@ -82,6 +72,4 @@ public class ConfigurableLifetime : ILifetime get { return sponsorshipTimeout; } set { sponsorshipTimeout = value; } } - - #endregion } diff --git a/src/Spring/Spring.Services/Remoting/Support/ICaoRemoteFactory.cs b/src/Spring/Spring.Services/Remoting/Support/ICaoRemoteFactory.cs index f0d6f373..c987c8b3 100644 --- a/src/Spring/Spring.Services/Remoting/Support/ICaoRemoteFactory.cs +++ b/src/Spring/Spring.Services/Remoting/Support/ICaoRemoteFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Remoting.Support; /// diff --git a/src/Spring/Spring.Services/Remoting/Support/ILifetime.cs b/src/Spring/Spring.Services/Remoting/Support/ILifetime.cs index f7414ac4..6817ed21 100644 --- a/src/Spring/Spring.Services/Remoting/Support/ILifetime.cs +++ b/src/Spring/Spring.Services/Remoting/Support/ILifetime.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Remoting.Support; /// diff --git a/src/Spring/Spring.Services/Remoting/Support/RemoteObjectProxyTypeBuilder.cs b/src/Spring/Spring.Services/Remoting/Support/RemoteObjectProxyTypeBuilder.cs index 327f25d3..cd3d329f 100644 --- a/src/Spring/Spring.Services/Remoting/Support/RemoteObjectProxyTypeBuilder.cs +++ b/src/Spring/Spring.Services/Remoting/Support/RemoteObjectProxyTypeBuilder.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using System.Reflection.Emit; using Spring.Proxy; @@ -31,8 +27,6 @@ namespace Spring.Remoting.Support; /// Bruno Baia internal class RemoteObjectProxyTypeBuilder : CompositionProxyTypeBuilder { - #region Fields - private static readonly MethodInfo TimeSpan_FromTicks = typeof(TimeSpan).GetMethod("FromTicks", BindingFlags.Public | BindingFlags.Static); @@ -50,10 +44,6 @@ internal class RemoteObjectProxyTypeBuilder : CompositionProxyTypeBuilder private ILifetime lifetime; - #endregion - - #region Constructor(s) / Destructor - /// /// Creates a new instance of the /// class. @@ -68,10 +58,6 @@ internal class RemoteObjectProxyTypeBuilder : CompositionProxyTypeBuilder Name = "RemoteObjectProxy"; } - #endregion - - #region IProxyTypeBuilder Members - /// /// Creates a remotable proxy type based on . /// @@ -91,10 +77,6 @@ internal class RemoteObjectProxyTypeBuilder : CompositionProxyTypeBuilder return base.BuildProxyType(); } - #endregion - - #region Protected Methods - /// /// Implements constructors for the proxy class. /// @@ -164,6 +146,4 @@ internal class RemoteObjectProxyTypeBuilder : CompositionProxyTypeBuilder } } } - - #endregion } diff --git a/src/Spring/Spring.Services/ServiceModel/Activation/ServiceHostFactory.cs b/src/Spring/Spring.Services/ServiceModel/Activation/ServiceHostFactory.cs index 1794361b..5a782b1b 100644 --- a/src/Spring/Spring.Services/ServiceModel/Activation/ServiceHostFactory.cs +++ b/src/Spring/Spring.Services/ServiceModel/Activation/ServiceHostFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.ServiceModel; using Spring.Util; using Spring.Context.Support; diff --git a/src/Spring/Spring.Services/ServiceModel/Activation/ServiceHostFactoryObject.cs b/src/Spring/Spring.Services/ServiceModel/Activation/ServiceHostFactoryObject.cs index 3fadf41f..83336a75 100644 --- a/src/Spring/Spring.Services/ServiceModel/Activation/ServiceHostFactoryObject.cs +++ b/src/Spring/Spring.Services/ServiceModel/Activation/ServiceHostFactoryObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.ServiceModel; using Microsoft.Extensions.Logging; using Spring.Objects.Factory; @@ -31,14 +27,8 @@ namespace Spring.ServiceModel.Activation; /// Bruno Baia public class ServiceHostFactoryObject : IFactoryObject, IInitializingObject, IObjectFactoryAware, IDisposable { - #region Logging - private static readonly ILogger LOG = LogManager.GetLogger(); - #endregion - - #region Fields - private string _targetName; private bool _useServiceProxyTypeCache = true; private Uri[] _baseAddresses = new Uri[] { }; @@ -53,10 +43,6 @@ public class ServiceHostFactoryObject : IFactoryObject, IInitializingObject, IOb /// protected SpringServiceHost springServiceHost; - #endregion - - #region Properties - /// /// Gets or sets the name of the target object that should be exposed as a service. /// @@ -91,10 +77,6 @@ public class ServiceHostFactoryObject : IFactoryObject, IInitializingObject, IOb set { _useServiceProxyTypeCache = value; } } - #endregion - - #region Constructor(s) / Destructor - /// /// Creates a new instance of the /// class. @@ -103,10 +85,6 @@ public class ServiceHostFactoryObject : IFactoryObject, IInitializingObject, IOb { } - #endregion - - #region IObjectFactoryAware Members - /// /// Callback that supplies the owning factory to an object instance. /// @@ -132,10 +110,6 @@ public class ServiceHostFactoryObject : IFactoryObject, IInitializingObject, IOb set { this.objectFactory = value; } } - #endregion - - #region IFactoryObject Members - /// /// Return a instance /// managed by this factory. @@ -166,10 +140,6 @@ public class ServiceHostFactoryObject : IFactoryObject, IInitializingObject, IOb get { return false; } } - #endregion - - #region IInitializingObject Members - /// /// Publish the object. /// @@ -181,20 +151,12 @@ public class ServiceHostFactoryObject : IFactoryObject, IInitializingObject, IOb springServiceHost.Open(); - #region Instrumentation - if (LOG.IsEnabled(LogLevel.Information)) { LOG.LogInformation(String.Format("The service '{0}' is ready and can now be accessed.", TargetName)); } - - #endregion } - #endregion - - #region IDisposable Members - /// /// Close the SpringServiceHost /// @@ -206,10 +168,6 @@ public class ServiceHostFactoryObject : IFactoryObject, IInitializingObject, IOb } } - #endregion - - #region Protected Methods - /// /// Validates the configuration. /// @@ -220,6 +178,4 @@ public class ServiceHostFactoryObject : IFactoryObject, IInitializingObject, IOb throw new ArgumentException("The TargetName property is required."); } } - - #endregion } diff --git a/src/Spring/Spring.Services/ServiceModel/Activation/WebServiceHostFactory.cs b/src/Spring/Spring.Services/ServiceModel/Activation/WebServiceHostFactory.cs index 8348c9c4..a5a1c77e 100644 --- a/src/Spring/Spring.Services/ServiceModel/Activation/WebServiceHostFactory.cs +++ b/src/Spring/Spring.Services/ServiceModel/Activation/WebServiceHostFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.ServiceModel; using Spring.Util; using Spring.Context.Support; diff --git a/src/Spring/Spring.Services/ServiceModel/ChannelFactoryObject.cs b/src/Spring/Spring.Services/ServiceModel/ChannelFactoryObject.cs index 8dc19631..d55e9fe8 100644 --- a/src/Spring/Spring.Services/ServiceModel/ChannelFactoryObject.cs +++ b/src/Spring/Spring.Services/ServiceModel/ChannelFactoryObject.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.ServiceModel; using Microsoft.Extensions.Logging; using Spring.Objects.Factory; @@ -32,12 +28,8 @@ namespace Spring.ServiceModel; /// Bruno Baia public class ChannelFactoryObject : ChannelFactory, IFactoryObject { - #region Logging - private static readonly ILogger Log = LogManager.GetLogger(typeof(ChannelFactoryObject<>)); - #endregion - private bool _isSingleton = true; private string _endpointConfigurationName; @@ -61,8 +53,6 @@ public class ChannelFactoryObject : ChannelFactory, IFactoryObject get { return this._endpointConfigurationName; } } - #region IFactoryObject Membres - /// /// Return an instance (possibly shared or independent) of the channel /// managed by this factory. @@ -73,8 +63,6 @@ public class ChannelFactoryObject : ChannelFactory, IFactoryObject /// public object GetObject() { - #region Instrumentation - if (Log.IsEnabled(LogLevel.Debug)) { Log.LogDebug(String.Format( @@ -82,8 +70,6 @@ public class ChannelFactoryObject : ChannelFactory, IFactoryObject typeof(T).FullName, this._endpointConfigurationName)); } - #endregion - return this.CreateChannel(); } @@ -107,6 +93,4 @@ public class ChannelFactoryObject : ChannelFactory, IFactoryObject get { return this._isSingleton; } set { this._isSingleton = value; } } - - #endregion } \ No newline at end of file diff --git a/src/Spring/Spring.Services/ServiceModel/Config/ChannelFactoryObjectDefinitionParser.cs b/src/Spring/Spring.Services/ServiceModel/Config/ChannelFactoryObjectDefinitionParser.cs index e375bc02..b0f37f99 100644 --- a/src/Spring/Spring.Services/ServiceModel/Config/ChannelFactoryObjectDefinitionParser.cs +++ b/src/Spring/Spring.Services/ServiceModel/Config/ChannelFactoryObjectDefinitionParser.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Xml; using Spring.Util; using Spring.Objects.Factory.Xml; @@ -37,8 +33,6 @@ public class ChannelFactoryObjectDefinitionParser : ObjectsNamespaceParser, IObj private static readonly string ChannelTypeAttribute = "channelType"; private static readonly string EndpointConfigurationNameAttribute = "endpointConfigurationName"; - #region IObjectDefinitionParser Members - /// /// Parse the specified XmlElement and register the resulting /// ObjectDefinitions with the IObjectDefinitionRegistry @@ -94,6 +88,4 @@ public class ChannelFactoryObjectDefinitionParser : ObjectsNamespaceParser, IObj return null; } - - #endregion } diff --git a/src/Spring/Spring.Services/ServiceModel/Config/WcfNamespaceParser.cs b/src/Spring/Spring.Services/ServiceModel/Config/WcfNamespaceParser.cs index bc5c4345..18d4a14f 100644 --- a/src/Spring/Spring.Services/ServiceModel/Config/WcfNamespaceParser.cs +++ b/src/Spring/Spring.Services/ServiceModel/Config/WcfNamespaceParser.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects.Factory.Xml; namespace Spring.ServiceModel.Config; diff --git a/src/Spring/Spring.Services/ServiceModel/ServiceExporter.cs b/src/Spring/Spring.Services/ServiceModel/ServiceExporter.cs index e17e6567..548c7993 100644 --- a/src/Spring/Spring.Services/ServiceModel/ServiceExporter.cs +++ b/src/Spring/Spring.Services/ServiceModel/ServiceExporter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Reflection; using System.Reflection.Emit; @@ -39,14 +35,8 @@ namespace Spring.ServiceModel; /// Bruno Baia public class ServiceExporter : IFactoryObject, IInitializingObject, IObjectFactoryAware, IObjectNameAware { - #region Logging - //private static readonly ILogger LOG = LogManager.GetLogger(); - #endregion - - #region Fields - private string _targetName; private Type _contractInterface; private IList _typeAttributes = new ArrayList(); @@ -75,10 +65,6 @@ public class ServiceExporter : IFactoryObject, IInitializingObject, IObjectFacto /// private Type proxyType; - #endregion - - #region Constructor(s) / Destructor - /// /// Creates a new instance of the class. /// @@ -86,10 +72,6 @@ public class ServiceExporter : IFactoryObject, IInitializingObject, IObjectFacto { } - #endregion - - #region Properties - /// /// Gets or sets the name of the target object definition. /// @@ -227,10 +209,6 @@ public class ServiceExporter : IFactoryObject, IInitializingObject, IObjectFacto set { _sessionMode = value; } } - #endregion - - #region IObjectFactoryAware Members - /// /// Callback that supplies the owning factory to an object instance. /// @@ -267,10 +245,6 @@ public class ServiceExporter : IFactoryObject, IInitializingObject, IObjectFacto } } - #endregion - - #region IInitializingObject Members - /// /// Publish the object /// @@ -280,10 +254,6 @@ public class ServiceExporter : IFactoryObject, IInitializingObject, IObjectFacto GenerateProxy(); } - #endregion - - #region IFactoryObject Members - /// /// Return an instance (possibly shared or independent) of the object /// managed by this factory. @@ -323,10 +293,6 @@ public class ServiceExporter : IFactoryObject, IInitializingObject, IObjectFacto get { return false; } } - #endregion - - #region IObjectNameAware Members - /// /// Set the name of the object in the object factory that created this object. /// @@ -347,10 +313,6 @@ public class ServiceExporter : IFactoryObject, IInitializingObject, IObjectFacto set { this.objectName = value; } } - #endregion - - #region Protected Methods - /// /// Validates the configuration. /// @@ -382,10 +344,6 @@ public class ServiceExporter : IFactoryObject, IInitializingObject, IObjectFacto proxyType = builder.BuildProxyType(); } - #endregion - - #region ConfigurableServiceProxyTypeBuilder inner class implementation - /// /// Builds a WCF service type. /// @@ -588,6 +546,4 @@ public class ServiceExporter : IFactoryObject, IInitializingObject, IObjectFacto } } } - - #endregion } diff --git a/src/Spring/Spring.Services/ServiceModel/SpringServiceHost.cs b/src/Spring/Spring.Services/ServiceModel/SpringServiceHost.cs index fec489a5..7455f010 100644 --- a/src/Spring/Spring.Services/ServiceModel/SpringServiceHost.cs +++ b/src/Spring/Spring.Services/ServiceModel/SpringServiceHost.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Util; using Spring.Context; using Spring.Context.Support; @@ -32,8 +28,6 @@ namespace Spring.ServiceModel; /// Bruno Baia public class SpringServiceHost : System.ServiceModel.ServiceHost { - #region Constructor(s) / Destructor - /// /// Creates a new instance of the class. /// @@ -105,6 +99,4 @@ public class SpringServiceHost : System.ServiceModel.ServiceHost return new ServiceProxyTypeBuilder(serviceName, objectFactory, useServiceProxyTypeCache) .BuildProxyType(); } - - #endregion } diff --git a/src/Spring/Spring.Services/ServiceModel/SpringWebServiceHost.cs b/src/Spring/Spring.Services/ServiceModel/SpringWebServiceHost.cs index 9623ec0a..1b5c2874 100644 --- a/src/Spring/Spring.Services/ServiceModel/SpringWebServiceHost.cs +++ b/src/Spring/Spring.Services/ServiceModel/SpringWebServiceHost.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Util; using Spring.Context; using Spring.Context.Support; @@ -33,8 +29,6 @@ namespace Spring.ServiceModel; /// Bruno Baia public class SpringWebServiceHost : WebServiceHost { - #region Constructor(s) / Destructor - /// /// Creates a new instance of the class. /// @@ -106,6 +100,4 @@ public class SpringWebServiceHost : WebServiceHost return new ServiceProxyTypeBuilder(serviceName, objectFactory, useServiceProxyTypeCache) .BuildProxyType(); } - - #endregion } diff --git a/src/Spring/Spring.Services/ServiceModel/Support/ServiceProxyTypeBuilder.cs b/src/Spring/Spring.Services/ServiceModel/Support/ServiceProxyTypeBuilder.cs index 9c09f198..56a0f2e5 100644 --- a/src/Spring/Spring.Services/ServiceModel/Support/ServiceProxyTypeBuilder.cs +++ b/src/Spring/Spring.Services/ServiceModel/Support/ServiceProxyTypeBuilder.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Reflection; using System.Reflection.Emit; @@ -33,8 +29,6 @@ namespace Spring.ServiceModel.Support; /// Bruno Baia public class ServiceProxyTypeBuilder : CompositionProxyTypeBuilder { - #region Fields - private static readonly MethodInfo GetObject = //typeof(IObjectFactory).GetMethod("GetObject", new Type[] { typeof(string) }); ReflectionUtils.GetMethod(typeof(IObjectFactory), "GetObject", new Type[] { typeof(string) }); @@ -50,10 +44,6 @@ public class ServiceProxyTypeBuilder : CompositionProxyTypeBuilder /// protected FieldBuilder objectFactoryField; - #endregion - - #region Constructor(s) / Destructor - /// /// Creates a new instance of the /// class. @@ -84,10 +74,6 @@ public class ServiceProxyTypeBuilder : CompositionProxyTypeBuilder this.TargetType = objectFactory.GetType(targetName); } - #endregion - - #region Protected Methods - /// /// Creates a proxy that delegates calls to an instance of the target object. /// This overriden implementation caches the generated proxy type @@ -169,6 +155,4 @@ public class ServiceProxyTypeBuilder : CompositionProxyTypeBuilder return typeBuilder; } - - #endregion } diff --git a/src/Spring/Spring.Services/Web/Services/WebServiceProxyFactory.cs b/src/Spring/Spring.Services/Web/Services/WebServiceProxyFactory.cs index 38822afb..68b99b50 100644 --- a/src/Spring/Spring.Services/Web/Services/WebServiceProxyFactory.cs +++ b/src/Spring/Spring.Services/Web/Services/WebServiceProxyFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Xml.Schema; using System.Xml.Serialization; @@ -54,14 +50,8 @@ namespace Spring.Web.Services; /// Aleksandar Seovic public class WebServiceProxyFactory : IConfigurableFactoryObject, IInitializingObject { - #region Logging - private static readonly ILogger LOG = LogManager.GetLogger(); - #endregion - - #region Fields - private IObjectDefinition _productTemplate; private Type _webServiceProxyBaseType = typeof(SoapHttpClientProtocol); private IResource _serviceUri; @@ -79,10 +69,6 @@ public class WebServiceProxyFactory : IConfigurableFactoryObject, IInitializingO /// protected ConstructorInfo proxyConstructor; - #endregion - - #region Constructor(s) / Destructor - /// /// Creates a new instance of the /// class. @@ -91,10 +77,6 @@ public class WebServiceProxyFactory : IConfigurableFactoryObject, IInitializingO { } - #endregion - - #region Properties - /// /// Gets or sets the base type that web service proxy should inherit. /// @@ -211,10 +193,6 @@ public class WebServiceProxyFactory : IConfigurableFactoryObject, IInitializingO set { _memberAttributes = value; } } - #endregion - - #region IConfigurableFactoryObject Members - /// /// Returns type of the web service proxy. /// @@ -255,10 +233,6 @@ public class WebServiceProxyFactory : IConfigurableFactoryObject, IInitializingO set { _productTemplate = value; } } - #endregion - - #region IInitializingObject Members - /// /// Initializes factory object. /// @@ -267,10 +241,6 @@ public class WebServiceProxyFactory : IConfigurableFactoryObject, IInitializingO ValidateConfiguration(); } - #endregion - - #region Protected Methods - /// /// Validates the configuration. /// @@ -325,8 +295,6 @@ public class WebServiceProxyFactory : IConfigurableFactoryObject, IInitializingO proxyConstructor = wrapper.GetConstructor(Type.EmptyTypes); - #region Instrumentation - if (LOG.IsEnabled(LogLevel.Debug)) { if (ServiceUri != null) @@ -340,14 +308,8 @@ public class WebServiceProxyFactory : IConfigurableFactoryObject, IInitializingO ProxyType.FullName)); } } - - #endregion } - #endregion - - #region Private Methods - /// /// Gets XML Web Services documents from a Spring resource. /// @@ -422,24 +384,14 @@ public class WebServiceProxyFactory : IConfigurableFactoryObject, IInitializingO } } - #endregion - - #region SoapHttpClientProxyTypeBuilder inner class implementation - /// /// Proxy type builder that can be used to create a proxy for /// derived classes. /// private sealed class SoapHttpClientProxyTypeBuilder : AbstractProxyTypeBuilder { - #region Logging - private static readonly ILogger LOG = LogManager.GetLogger(); - #endregion - - #region Fields - // Binding/Type related private IResource serviceUri; private ServiceDescriptionCollection wsDescriptions; @@ -454,10 +406,6 @@ public class WebServiceProxyFactory : IConfigurableFactoryObject, IInitializingO private XmlMembersMapping inputMembersMapping; private XmlMembersMapping outputMembersMapping; - #endregion - - #region Constructor(s) / Destructor - /// /// Creates a new instance of the /// class. @@ -476,10 +424,6 @@ public class WebServiceProxyFactory : IConfigurableFactoryObject, IInitializingO Initialize(wsDocuments, bindingName); } - #endregion - - #region IProxyTypeBuilder Members - /// /// Creates the proxy type. /// @@ -511,10 +455,6 @@ public class WebServiceProxyFactory : IConfigurableFactoryObject, IInitializingO return typeBuilder.CreateType(); } - #endregion - - #region IProxyTypeGenerator Members - /// /// Generates the IL instructions that pushes /// the target instance on which calls should be delegated to. @@ -525,10 +465,6 @@ public class WebServiceProxyFactory : IConfigurableFactoryObject, IInitializingO PushProxy(il); } - #endregion - - #region Protected Methods - /// /// Implements constructors for the proxy class. /// @@ -677,11 +613,7 @@ public class WebServiceProxyFactory : IConfigurableFactoryObject, IInitializingO } */ - #endregion - - #region Private Methods - - private void Initialize(DiscoveryClientDocumentCollection wsDocuments, string bindingName) +private void Initialize(DiscoveryClientDocumentCollection wsDocuments, string bindingName) { // Service descriptions this.wsDescriptions = new ServiceDescriptionCollection(); @@ -745,15 +677,11 @@ public class WebServiceProxyFactory : IConfigurableFactoryObject, IInitializingO { foreach (Binding binding in description.Bindings) { - #region Instrumentation - if (LOG.IsEnabled(LogLevel.Information)) { LOG.LogInformation(String.Format("The binding '{0}', found in the WSDL document located at '{1}', will be use.", binding.Name, this.serviceUri.Description)); } - #endregion - return binding; } } @@ -945,25 +873,15 @@ public class WebServiceProxyFactory : IConfigurableFactoryObject, IInitializingO return cabb.Build(); } - #endregion - - #region SoapHttpClientProxyMethodBuilder inner class implementation - /// /// Proxy method builder that can be used to create a proxy method /// for web services operation invocation. /// private sealed class SoapHttpClientProxyMethodBuilder : AbstractProxyMethodBuilder { - #region Fields - private static readonly MethodInfo Invoke = typeof(SoapHttpClientProtocol).GetMethod("Invoke", BindingFlags.NonPublic | BindingFlags.Instance); - #endregion - - #region Constructor(s) / Destructor - /// /// Creates a new instance of the method builder. /// @@ -977,10 +895,6 @@ public class WebServiceProxyFactory : IConfigurableFactoryObject, IInitializingO { } - #endregion - - #region Protected Methods - /// /// Generates the proxy method. /// @@ -1087,25 +1001,15 @@ public class WebServiceProxyFactory : IConfigurableFactoryObject, IInitializingO } } } - - #endregion } - - #endregion } - #endregion - - #region WebServiceProxyProxyTypeBuilder inner class implementation - /// /// Proxy type builder that can be used to create a proxy for /// .Net-generated proxy class that can be safely cast to a service interface. /// private sealed class WebServiceProxyProxyTypeBuilder : InheritanceProxyTypeBuilder { - #region Constructor(s) / Destructor - /// /// Creates a new instance of the /// class. @@ -1116,10 +1020,6 @@ public class WebServiceProxyFactory : IConfigurableFactoryObject, IInitializingO this.DeclaredMembersOnly = true; } - #endregion - - #region Protected Methods - /// /// Gets the mapping of the interface to proxy /// into the actual methods on the target type @@ -1151,9 +1051,5 @@ public class WebServiceProxyFactory : IConfigurableFactoryObject, IInitializingO return mapping; } - - #endregion } - - #endregion } diff --git a/src/Spring/Spring.Template.Velocity.Castle/AssemblyInfo.cs b/src/Spring/Spring.Template.Velocity.Castle/AssemblyInfo.cs index 98429041..97bffd3c 100644 --- a/src/Spring/Spring.Template.Velocity.Castle/AssemblyInfo.cs +++ b/src/Spring/Spring.Template.Velocity.Castle/AssemblyInfo.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using System.Runtime.InteropServices; diff --git a/src/Spring/Spring.Template.Velocity.Castle/Template/Velocity/Config/TemplateNamespaceParser.cs b/src/Spring/Spring.Template.Velocity.Castle/Template/Velocity/Config/TemplateNamespaceParser.cs index 9390152a..f14d3202 100644 --- a/src/Spring/Spring.Template.Velocity.Castle/Template/Velocity/Config/TemplateNamespaceParser.cs +++ b/src/Spring/Spring.Template.Velocity.Castle/Template/Velocity/Config/TemplateNamespaceParser.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Xml; using NVelocity.Runtime; @@ -30,8 +24,6 @@ using Spring.Objects.Factory.Support; using Spring.Objects.Factory.Xml; using Spring.Util; -#endregion - namespace Spring.Template.Velocity.Config; /// @@ -388,8 +380,6 @@ public class TemplateNamespaceParser : ObjectsNamespaceParser } } -#region Element & Attribute Name Constants - /// /// Template definition constants /// @@ -504,6 +494,4 @@ public class TemplateDefinitionConstants /// the type used for spring resource loader /// public const string SpringResourceLoaderClass = "Spring.Template.Velocity.SpringResourceLoader; Spring.Template.Velocity.Castle"; -} - -#endregion \ No newline at end of file +} \ No newline at end of file diff --git a/src/Spring/Spring.Template.Velocity.Castle/Template/Velocity/SpringResourceLoader.cs b/src/Spring/Spring.Template.Velocity.Castle/Template/Velocity/SpringResourceLoader.cs index ee9e4f83..373fc04a 100644 --- a/src/Spring/Spring.Template.Velocity.Castle/Template/Velocity/SpringResourceLoader.cs +++ b/src/Spring/Spring.Template.Velocity.Castle/Template/Velocity/SpringResourceLoader.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Commons.Collections; using Microsoft.Extensions.Logging; using NVelocity.Runtime.Resource; diff --git a/src/Spring/Spring.Template.Velocity/AssemblyInfo.cs b/src/Spring/Spring.Template.Velocity/AssemblyInfo.cs index c2c71f74..47953f1f 100644 --- a/src/Spring/Spring.Template.Velocity/AssemblyInfo.cs +++ b/src/Spring/Spring.Template.Velocity/AssemblyInfo.cs @@ -1,7 +1,5 @@ -#region License - /* - * Copyright © 2002-2011 the original author or authors. + * Copyright � 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using System.Runtime.InteropServices; diff --git a/src/Spring/Spring.Template.Velocity/Template/Velocity/CommonsLoggingLogSystem.cs b/src/Spring/Spring.Template.Velocity/Template/Velocity/CommonsLoggingLogSystem.cs index 22bd82b8..1240572b 100644 --- a/src/Spring/Spring.Template.Velocity/Template/Velocity/CommonsLoggingLogSystem.cs +++ b/src/Spring/Spring.Template.Velocity/Template/Velocity/CommonsLoggingLogSystem.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using NVelocity.Runtime; using NVelocity.Runtime.Log; diff --git a/src/Spring/Spring.Template.Velocity/Template/Velocity/Config/TemplateNamespaceParser.cs b/src/Spring/Spring.Template.Velocity/Template/Velocity/Config/TemplateNamespaceParser.cs index 2d14b9de..9f588a7b 100644 --- a/src/Spring/Spring.Template.Velocity/Template/Velocity/Config/TemplateNamespaceParser.cs +++ b/src/Spring/Spring.Template.Velocity/Template/Velocity/Config/TemplateNamespaceParser.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Xml; using NVelocity.Runtime; @@ -30,8 +24,6 @@ using Spring.Objects.Factory.Support; using Spring.Objects.Factory.Xml; using Spring.Util; -#endregion - namespace Spring.Template.Velocity.Config; /// @@ -388,8 +380,6 @@ public class TemplateNamespaceParser : ObjectsNamespaceParser } } -#region Element & Attribute Name Constants - /// /// Template definition constants /// @@ -504,6 +494,4 @@ public class TemplateDefinitionConstants /// the type used for spring resource loader /// public const string SpringResourceLoaderClass = "Spring.Template.Velocity.SpringResourceLoader; Spring.Template.Velocity"; -} - -#endregion +} \ No newline at end of file diff --git a/src/Spring/Spring.Template.Velocity/Template/Velocity/SpringResourceLoader.cs b/src/Spring/Spring.Template.Velocity/Template/Velocity/SpringResourceLoader.cs index ea6a999c..42f96335 100644 --- a/src/Spring/Spring.Template.Velocity/Template/Velocity/SpringResourceLoader.cs +++ b/src/Spring/Spring.Template.Velocity/Template/Velocity/SpringResourceLoader.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Commons.Collections; using Microsoft.Extensions.Logging; using NVelocity.Runtime.Resource; diff --git a/src/Spring/Spring.Template.Velocity/Template/Velocity/VelocityEngineFactory.cs b/src/Spring/Spring.Template.Velocity/Template/Velocity/VelocityEngineFactory.cs index 27c4fc98..7d94d181 100644 --- a/src/Spring/Spring.Template.Velocity/Template/Velocity/VelocityEngineFactory.cs +++ b/src/Spring/Spring.Template.Velocity/Template/Velocity/VelocityEngineFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Commons.Collections; using Microsoft.Extensions.Logging; diff --git a/src/Spring/Spring.Template.Velocity/Template/Velocity/VelocityEngineFactoryObject.cs b/src/Spring/Spring.Template.Velocity/Template/Velocity/VelocityEngineFactoryObject.cs index f7c90645..9c97e223 100644 --- a/src/Spring/Spring.Template.Velocity/Template/Velocity/VelocityEngineFactoryObject.cs +++ b/src/Spring/Spring.Template.Velocity/Template/Velocity/VelocityEngineFactoryObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NVelocity.App; using Spring.Context; using Spring.Objects.Factory; diff --git a/src/Spring/Spring.Template.Velocity/Template/Velocity/VelocityEngineUtils.cs b/src/Spring/Spring.Template.Velocity/Template/Velocity/VelocityEngineUtils.cs index e803031f..6a3d247e 100644 --- a/src/Spring/Spring.Template.Velocity/Template/Velocity/VelocityEngineUtils.cs +++ b/src/Spring/Spring.Template.Velocity/Template/Velocity/VelocityEngineUtils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using NVelocity; using NVelocity.App; diff --git a/src/Spring/Spring.Testing.Microsoft/Testing/Microsoft/AbstractDependencyInjectionSpringContextTests.cs b/src/Spring/Spring.Testing.Microsoft/Testing/Microsoft/AbstractDependencyInjectionSpringContextTests.cs index 58393ccd..dbf868d6 100644 --- a/src/Spring/Spring.Testing.Microsoft/Testing/Microsoft/AbstractDependencyInjectionSpringContextTests.cs +++ b/src/Spring/Spring.Testing.Microsoft/Testing/Microsoft/AbstractDependencyInjectionSpringContextTests.cs @@ -1,5 +1,3 @@ -#region License - /* /// Copyright 2002-2010 the original author or authors. /// @@ -16,8 +14,6 @@ /// limitations under the License. */ -#endregion - using System.Reflection; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/src/Spring/Spring.Testing.Microsoft/Testing/Microsoft/AbstractSpringContextTests.cs b/src/Spring/Spring.Testing.Microsoft/Testing/Microsoft/AbstractSpringContextTests.cs index a3d2934c..f0ff6c61 100644 --- a/src/Spring/Spring.Testing.Microsoft/Testing/Microsoft/AbstractSpringContextTests.cs +++ b/src/Spring/Spring.Testing.Microsoft/Testing/Microsoft/AbstractSpringContextTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Microsoft.Extensions.Logging; using Spring.Context; diff --git a/src/Spring/Spring.Testing.Microsoft/Testing/Microsoft/AbstractTransactionalDbProviderSpringContextTests.cs b/src/Spring/Spring.Testing.Microsoft/Testing/Microsoft/AbstractTransactionalDbProviderSpringContextTests.cs index 0095998b..6956d26f 100644 --- a/src/Spring/Spring.Testing.Microsoft/Testing/Microsoft/AbstractTransactionalDbProviderSpringContextTests.cs +++ b/src/Spring/Spring.Testing.Microsoft/Testing/Microsoft/AbstractTransactionalDbProviderSpringContextTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; using Microsoft.Extensions.Logging; using Spring.Data.Common; diff --git a/src/Spring/Spring.Testing.Microsoft/Testing/Microsoft/AbstractTransactionalSpringContextTests.cs b/src/Spring/Spring.Testing.Microsoft/Testing/Microsoft/AbstractTransactionalSpringContextTests.cs index 53553d93..aad58369 100644 --- a/src/Spring/Spring.Testing.Microsoft/Testing/Microsoft/AbstractTransactionalSpringContextTests.cs +++ b/src/Spring/Spring.Testing.Microsoft/Testing/Microsoft/AbstractTransactionalSpringContextTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using Spring.Transaction; using Spring.Transaction.Support; diff --git a/src/Spring/Spring.Testing.NUnit/Testing/Ado/SimpleAdoTestUtils.cs b/src/Spring/Spring.Testing.NUnit/Testing/Ado/SimpleAdoTestUtils.cs index 462420ac..579ed6a1 100644 --- a/src/Spring/Spring.Testing.NUnit/Testing/Ado/SimpleAdoTestUtils.cs +++ b/src/Spring/Spring.Testing.NUnit/Testing/Ado/SimpleAdoTestUtils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; using System.Reflection; using System.Text.RegularExpressions; @@ -243,8 +239,6 @@ public class SimpleAdoTestUtils blockCollector.Add(tmp); } - #region To be probably added in a future version - // public static void ExecuteSqlScript( AdoTemplate adoTemplate, IResource scriptResource, string blockDelimiter, bool continueOnError ) // { // ExecuteSqlScript( adoTemplate, new EncodedResource(scriptResource), new Regex( Regex.Escape(blockDelimiter), REGEX_OPTIONS ), continueOnError ); @@ -283,8 +277,6 @@ public class SimpleAdoTestUtils // } // - #endregion - private class PlatformTransactionHolder : IPlatformTransaction { private ITransactionStatus txStatus; diff --git a/src/Spring/Spring.Testing.NUnit/Testing/NUnit/AbstractDependencyInjectionSpringContextTests.cs b/src/Spring/Spring.Testing.NUnit/Testing/NUnit/AbstractDependencyInjectionSpringContextTests.cs index ee4c2b5c..54bf1a21 100644 --- a/src/Spring/Spring.Testing.NUnit/Testing/NUnit/AbstractDependencyInjectionSpringContextTests.cs +++ b/src/Spring/Spring.Testing.NUnit/Testing/NUnit/AbstractDependencyInjectionSpringContextTests.cs @@ -1,5 +1,3 @@ -#region License - /* /// Copyright 2002-2010 the original author or authors. /// @@ -16,8 +14,6 @@ /// limitations under the License. */ -#endregion - using System.Reflection; using Microsoft.Extensions.Logging; using NUnit.Framework; diff --git a/src/Spring/Spring.Web.Conversation.NHibernate5/Data/NHibernate/Support/SessionPerConversationSettings.cs b/src/Spring/Spring.Web.Conversation.NHibernate5/Data/NHibernate/Support/SessionPerConversationSettings.cs index e819876f..62fcbd73 100644 --- a/src/Spring/Spring.Web.Conversation.NHibernate5/Data/NHibernate/Support/SessionPerConversationSettings.cs +++ b/src/Spring/Spring.Web.Conversation.NHibernate5/Data/NHibernate/Support/SessionPerConversationSettings.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NHibernate; namespace Spring.Data.NHibernate.Support; @@ -68,8 +64,6 @@ public class SessionPerConversationScopeSettings this.defaultFlushMode = defaultFlushMode; } - #region Properties - /// /// Gets the configured instance to be used. /// @@ -101,8 +95,6 @@ public class SessionPerConversationScopeSettings set { defaultFlushMode = value; } } - #endregion - /// /// Override this method to resolve an instance according to your chosen strategy. /// diff --git a/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/HttpModule/ConversationModule.cs b/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/HttpModule/ConversationModule.cs index c756c036..3f4facfe 100644 --- a/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/HttpModule/ConversationModule.cs +++ b/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/HttpModule/ConversationModule.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Web; using System.Web.UI; using Microsoft.Extensions.Logging; @@ -44,8 +40,6 @@ public class ConversationModule : IHttpModule, IApplicationContextAware set { conversationManagerName = value; } } - #region IHttpModule Members - /// /// Add PostRequestHandlerExecute event to clear conversations with timeout exceeded. /// @@ -124,10 +118,6 @@ public class ConversationModule : IHttpModule, IApplicationContextAware } } - #endregion - - #region IApplicationContextAware Members - private IApplicationContext applicationContext; /// @@ -161,6 +151,4 @@ public class ConversationModule : IHttpModule, IApplicationContextAware { set { this.applicationContext = value; } } - - #endregion } diff --git a/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/IConversationManager.cs b/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/IConversationManager.cs index 3bfeedd2..1009516b 100644 --- a/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/IConversationManager.cs +++ b/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/IConversationManager.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NHibernate; namespace Spring.Web.Conversation; diff --git a/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/IConversationState.cs b/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/IConversationState.cs index 21c8c35d..2c2ed4fd 100644 --- a/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/IConversationState.cs +++ b/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/IConversationState.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NHibernate; using Spring.Data.Common; diff --git a/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/InnerConversationList.cs b/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/InnerConversationList.cs index bbbbf62d..3e306694 100644 --- a/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/InnerConversationList.cs +++ b/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/InnerConversationList.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Microsoft.Extensions.Logging; using Spring.Collections.Generic; @@ -116,8 +112,6 @@ public class InnerConversationList : IList, IList } } - #region IList Members - /// /// /// @@ -168,10 +162,6 @@ public class InnerConversationList : IList, IList } } - #endregion - - #region ICollection Members - /// /// /// @@ -237,10 +227,6 @@ public class InnerConversationList : IList, IList return this.innerList.Remove(item); } - #endregion - - #region IEnumerable Members - /// /// /// @@ -250,10 +236,6 @@ public class InnerConversationList : IList, IList return this.innerList.GetEnumerator(); } - #endregion - - #region IEnumerable Members - /// /// /// @@ -263,10 +245,6 @@ public class InnerConversationList : IList, IList return this.innerList.GetEnumerator(); } - #endregion - - #region IList Members - /// /// /// @@ -342,10 +320,6 @@ public class InnerConversationList : IList, IList } } - #endregion - - #region ICollection Members - /// /// /// @@ -373,6 +347,4 @@ public class InnerConversationList : IList, IList { get { return this; } } - - #endregion } diff --git a/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/WebConversationManager.cs b/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/WebConversationManager.cs index e154c844..1c3d5bb7 100644 --- a/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/WebConversationManager.cs +++ b/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/WebConversationManager.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using NHibernate; using Spring.Context; @@ -53,8 +49,6 @@ public class WebConversationManager : SessionPerConversationScope, IConversation private readonly IDictionary conversations = new Dictionary(); private IConversationState activeConversation = null; - #region IConversationManager Members - /// /// /// @@ -261,10 +255,6 @@ public class WebConversationManager : SessionPerConversationScope, IConversation set { endPaused = value; } } - #endregion - - #region SessionPerConversationScope Members - /// /// Ends all conversations and Closes all their Session. /// @@ -283,8 +273,6 @@ public class WebConversationManager : SessionPerConversationScope, IConversation this.sessionFactory = null; } - #endregion - /// /// Remove conversation. /// @@ -305,8 +293,6 @@ public class WebConversationManager : SessionPerConversationScope, IConversation } } - #region IApplicationContextAware Members - private String applicationContextName; [NonSerialized] private IApplicationContext applicationContext = null; @@ -330,6 +316,4 @@ public class WebConversationManager : SessionPerConversationScope, IConversation return this.applicationContext; } } - - #endregion } diff --git a/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/WebConversationSpringState.cs b/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/WebConversationSpringState.cs index 60e8fecd..63e2c86c 100644 --- a/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/WebConversationSpringState.cs +++ b/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/WebConversationSpringState.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Web; using Microsoft.Extensions.Logging; @@ -49,8 +45,6 @@ public class WebConversationSpringState : IConversationState, IObjectNameAware, private IDictionary state = new Dictionary(); - #region IConversationState Members - private String id; /// @@ -392,10 +386,6 @@ public class WebConversationSpringState : IConversationState, IObjectNameAware, } } - #endregion - - #region IObjectNameAware Members - /// /// . It is used to valddate /// @@ -412,10 +402,6 @@ public class WebConversationSpringState : IConversationState, IObjectNameAware, } } - #endregion - - #region IDictionary Members - /// /// /// @@ -529,10 +515,6 @@ public class WebConversationSpringState : IConversationState, IObjectNameAware, } } - #endregion - - #region ICollection> Members - /// /// /// @@ -613,10 +595,6 @@ public class WebConversationSpringState : IConversationState, IObjectNameAware, return this.state.Remove(item); } - #endregion - - #region IEnumerable> Members - /// /// /// @@ -626,10 +604,6 @@ public class WebConversationSpringState : IConversationState, IObjectNameAware, return this.state.GetEnumerator(); } - #endregion - - #region IEnumerable Members - /// /// /// @@ -639,8 +613,6 @@ public class WebConversationSpringState : IConversationState, IObjectNameAware, return this.state.GetEnumerator(); } - #endregion - /// /// A String representation from conversation. /// @@ -662,8 +634,6 @@ public class WebConversationSpringState : IConversationState, IObjectNameAware, ); } - #region IApplicationContextAware Members - private String applicationContextName; [NonSerialized] private IApplicationContext applicationContext = null; @@ -687,6 +657,4 @@ public class WebConversationSpringState : IConversationState, IObjectNameAware, return this.applicationContext; } } - - #endregion } diff --git a/src/Spring/Spring.Web.Extensions/Web/Script/Services/ScriptHandlerFactory.cs b/src/Spring/Spring.Web.Extensions/Web/Script/Services/ScriptHandlerFactory.cs index 5f5ce357..e72ec399 100644 --- a/src/Spring/Spring.Web.Extensions/Web/Script/Services/ScriptHandlerFactory.cs +++ b/src/Spring/Spring.Web.Extensions/Web/Script/Services/ScriptHandlerFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using System.Web; using System.Web.Script.Services; diff --git a/src/Spring/Spring.Web.Mvc5/Context/Support/MvcApplicationContext.cs b/src/Spring/Spring.Web.Mvc5/Context/Support/MvcApplicationContext.cs index 67a4c51b..b65c41d8 100644 --- a/src/Spring/Spring.Web.Mvc5/Context/Support/MvcApplicationContext.cs +++ b/src/Spring/Spring.Web.Mvc5/Context/Support/MvcApplicationContext.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using Spring.Core.IO; diff --git a/src/Spring/Spring.Web.Mvc5/Context/Support/MvcApplicationContextArgs.cs b/src/Spring/Spring.Web.Mvc5/Context/Support/MvcApplicationContextArgs.cs index c0254f54..301a5efa 100644 --- a/src/Spring/Spring.Web.Mvc5/Context/Support/MvcApplicationContextArgs.cs +++ b/src/Spring/Spring.Web.Mvc5/Context/Support/MvcApplicationContextArgs.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Core.IO; namespace Spring.Context.Support; diff --git a/src/Spring/Spring.Web.Mvc5/Context/Support/MvcContextHandler.cs b/src/Spring/Spring.Web.Mvc5/Context/Support/MvcContextHandler.cs index 449d6848..6a1a840c 100644 --- a/src/Spring/Spring.Web.Mvc5/Context/Support/MvcContextHandler.cs +++ b/src/Spring/Spring.Web.Mvc5/Context/Support/MvcContextHandler.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Context.Support; /// diff --git a/src/Spring/Spring.Web.Mvc5/SpringActionInvoker.cs b/src/Spring/Spring.Web.Mvc5/SpringActionInvoker.cs index 56ae1e89..6428e28a 100644 --- a/src/Spring/Spring.Web.Mvc5/SpringActionInvoker.cs +++ b/src/Spring/Spring.Web.Mvc5/SpringActionInvoker.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Web.Mvc; using Spring.Context; diff --git a/src/Spring/Spring.Web.Mvc5/SpringControllerFactory.cs b/src/Spring/Spring.Web.Mvc5/SpringControllerFactory.cs index 618a3912..7f8f7152 100644 --- a/src/Spring/Spring.Web.Mvc5/SpringControllerFactory.cs +++ b/src/Spring/Spring.Web.Mvc5/SpringControllerFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Web.Mvc; using System.Web.Routing; using Spring.Context; diff --git a/src/Spring/Spring.Web.Mvc5/SpringMvcApplication.cs b/src/Spring/Spring.Web.Mvc5/SpringMvcApplication.cs index 45883f9c..254786ec 100644 --- a/src/Spring/Spring.Web.Mvc5/SpringMvcApplication.cs +++ b/src/Spring/Spring.Web.Mvc5/SpringMvcApplication.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Web; using System.Web.Mvc; using Spring.Context.Support; diff --git a/src/Spring/Spring.Web/Caching/AspNetCache.cs b/src/Spring/Spring.Web/Caching/AspNetCache.cs index afa8ffeb..7b144fe1 100644 --- a/src/Spring/Spring.Web/Caching/AspNetCache.cs +++ b/src/Spring/Spring.Web/Caching/AspNetCache.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Web; using System.Web.Caching; @@ -43,8 +39,6 @@ namespace Spring.Caching; /// Erich Eichinger public class AspNetCache : AbstractCache { - #region Internal Abstractions - /// /// Abstracts the underlying runtime cache /// @@ -99,10 +93,6 @@ public class AspNetCache : AbstractCache } } - #endregion - - #region Fields - // logger instance for this class private static readonly ILogger Log = LogManager.GetLogger(); @@ -116,8 +106,6 @@ public class AspNetCache : AbstractCache private CacheItemPriority _priority = CacheItemPriority.Default; private bool _slidingExpiration = false; - #endregion - /// /// Initializes a new instance of /// @@ -138,8 +126,6 @@ public class AspNetCache : AbstractCache _cacheName = typeof(AspNetCache).FullName + "[" + this.GetHashCode() + "]."; } - #region Configurable Properties - /// /// Gets/Sets a flag, whether to use sliding expiration policy. /// @@ -158,8 +144,6 @@ public class AspNetCache : AbstractCache set { _priority = value; } } - #endregion - /// /// Gets a collection of all cache item keys. /// diff --git a/src/Spring/Spring.Web/Context/Support/HttpApplicationConfigurer.cs b/src/Spring/Spring.Web/Context/Support/HttpApplicationConfigurer.cs index fbbd9101..b6ffe68d 100644 --- a/src/Spring/Spring.Web/Context/Support/HttpApplicationConfigurer.cs +++ b/src/Spring/Spring.Web/Context/Support/HttpApplicationConfigurer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Web; using Microsoft.Extensions.Logging; using Spring.Objects.Factory.Config; using Spring.Util; -#endregion - namespace Spring.Context.Support; /// @@ -38,8 +30,6 @@ public class HttpApplicationConfigurer { private static readonly ILogger Log = LogManager.GetLogger(); - #region ModuleDefinitionsTable class - private class ModuleDefinitionsTable : Hashtable { public void Add(string key, IObjectDefinition value) @@ -77,8 +67,6 @@ public class HttpApplicationConfigurer } } - #endregion - /// /// Holds shared application Template /// diff --git a/src/Spring/Spring.Web/Context/Support/WebApplicationContext.cs b/src/Spring/Spring.Web/Context/Support/WebApplicationContext.cs index 242e7ee1..b103c819 100644 --- a/src/Spring/Spring.Web/Context/Support/WebApplicationContext.cs +++ b/src/Spring/Spring.Web/Context/Support/WebApplicationContext.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Diagnostics; using System.Reflection; diff --git a/src/Spring/Spring.Web/Context/Support/WebApplicationContextArgs.cs b/src/Spring/Spring.Web/Context/Support/WebApplicationContextArgs.cs index 0d9c3e48..34489d0c 100644 --- a/src/Spring/Spring.Web/Context/Support/WebApplicationContextArgs.cs +++ b/src/Spring/Spring.Web/Context/Support/WebApplicationContextArgs.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Core.IO; namespace Spring.Context.Support; diff --git a/src/Spring/Spring.Web/Context/Support/WebContextHandler.cs b/src/Spring/Spring.Web/Context/Support/WebContextHandler.cs index 70b3ce63..4c2066b0 100644 --- a/src/Spring/Spring.Web/Context/Support/WebContextHandler.cs +++ b/src/Spring/Spring.Web/Context/Support/WebContextHandler.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Web.Configuration; using System.Xml; using Microsoft.Extensions.Logging; using Spring.Util; -#endregion - namespace Spring.Context.Support; /// diff --git a/src/Spring/Spring.Web/Context/Support/WebSupportModule.cs b/src/Spring/Spring.Web/Context/Support/WebSupportModule.cs index 6f17711e..a3d2288d 100644 --- a/src/Spring/Spring.Web/Context/Support/WebSupportModule.cs +++ b/src/Spring/Spring.Web/Context/Support/WebSupportModule.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using System.Reflection; using System.Security; @@ -173,8 +169,6 @@ public class WebSupportModule : IHttpModule } } - #region IHttpHandler configuration - /// /// Configures the current IHttpHandler as specified by . If the /// is not executed for the current request and an instance of @@ -282,8 +276,6 @@ public class WebSupportModule : IHttpModule return handler; } - #endregion - /// /// Disposes this instance /// @@ -292,8 +284,6 @@ public class WebSupportModule : IHttpModule // noop } - #region Session Handling Stuff - private static void OnCacheItemRemoved(string key, object value, CacheItemRemovedReason reason) { s_log.LogDebug("end session " + key + " because of " + reason); @@ -373,6 +363,4 @@ public class WebSupportModule : IHttpModule , CultureInfo.InvariantCulture ); } - - #endregion Session Handling Stuff } diff --git a/src/Spring/Spring.Web/Core/IO/WebResource.cs b/src/Spring/Spring.Web/Core/IO/WebResource.cs index 20a60977..53f7bb0f 100644 --- a/src/Spring/Spring.Web/Core/IO/WebResource.cs +++ b/src/Spring/Spring.Web/Core/IO/WebResource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Util; -#endregion - namespace Spring.Core.IO; /// diff --git a/src/Spring/Spring.Web/Globalization/AspNetResourceCache.cs b/src/Spring/Spring.Web/Globalization/AspNetResourceCache.cs index afefe605..c62c5fbb 100644 --- a/src/Spring/Spring.Web/Globalization/AspNetResourceCache.cs +++ b/src/Spring/Spring.Web/Globalization/AspNetResourceCache.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Web; using System.Web.Caching; diff --git a/src/Spring/Spring.Web/Globalization/Resolvers/CookieCultureResolver.cs b/src/Spring/Spring.Web/Globalization/Resolvers/CookieCultureResolver.cs index 074d1f7f..85466db9 100644 --- a/src/Spring/Spring.Web/Globalization/Resolvers/CookieCultureResolver.cs +++ b/src/Spring/Spring.Web/Globalization/Resolvers/CookieCultureResolver.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using System.Web; diff --git a/src/Spring/Spring.Web/Globalization/Resolvers/DefaultWebCultureResolver.cs b/src/Spring/Spring.Web/Globalization/Resolvers/DefaultWebCultureResolver.cs index e2e1d7a6..12a326ed 100644 --- a/src/Spring/Spring.Web/Globalization/Resolvers/DefaultWebCultureResolver.cs +++ b/src/Spring/Spring.Web/Globalization/Resolvers/DefaultWebCultureResolver.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using System.Web; using Spring.Util; diff --git a/src/Spring/Spring.Web/Globalization/Resolvers/RequestCultureResolver.cs b/src/Spring/Spring.Web/Globalization/Resolvers/RequestCultureResolver.cs index f0718564..df501ecd 100644 --- a/src/Spring/Spring.Web/Globalization/Resolvers/RequestCultureResolver.cs +++ b/src/Spring/Spring.Web/Globalization/Resolvers/RequestCultureResolver.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using System.Web; diff --git a/src/Spring/Spring.Web/Globalization/Resolvers/SessionCultureResolver.cs b/src/Spring/Spring.Web/Globalization/Resolvers/SessionCultureResolver.cs index 6a18cd17..6ca0f837 100644 --- a/src/Spring/Spring.Web/Globalization/Resolvers/SessionCultureResolver.cs +++ b/src/Spring/Spring.Web/Globalization/Resolvers/SessionCultureResolver.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using System.Web; using Spring.Util; diff --git a/src/Spring/Spring.Web/Objects/Factory/Support/ChildWebObjectDefinition.cs b/src/Spring/Spring.Web/Objects/Factory/Support/ChildWebObjectDefinition.cs index c64081ad..86d53bb1 100644 --- a/src/Spring/Spring.Web/Objects/Factory/Support/ChildWebObjectDefinition.cs +++ b/src/Spring/Spring.Web/Objects/Factory/Support/ChildWebObjectDefinition.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using Spring.Objects.Factory.Config; using Spring.Util; @@ -39,8 +35,6 @@ public class ChildWebObjectDefinition : ChildObjectDefinition, IWebObjectDefinit // private ObjectScope _scope = ObjectScope.Default; private string _pageName; - #region Constructors - /// /// Creates a new instance of the /// class @@ -98,8 +92,6 @@ public class ChildWebObjectDefinition : ChildObjectDefinition, IWebObjectDefinit _pageName = WebUtils.CombineVirtualPaths(VirtualEnvironment.CurrentExecutionFilePath, pageName); } - #endregion - /// /// Object scope. /// diff --git a/src/Spring/Spring.Web/Objects/Factory/Support/IWebObjectDefinition.cs b/src/Spring/Spring.Web/Objects/Factory/Support/IWebObjectDefinition.cs index 817228d8..3d4ce24d 100644 --- a/src/Spring/Spring.Web/Objects/Factory/Support/IWebObjectDefinition.cs +++ b/src/Spring/Spring.Web/Objects/Factory/Support/IWebObjectDefinition.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory.Support; /// diff --git a/src/Spring/Spring.Web/Objects/Factory/Support/IWebObjectNameGenerator.cs b/src/Spring/Spring.Web/Objects/Factory/Support/IWebObjectNameGenerator.cs index 66498607..656fee8a 100644 --- a/src/Spring/Spring.Web/Objects/Factory/Support/IWebObjectNameGenerator.cs +++ b/src/Spring/Spring.Web/Objects/Factory/Support/IWebObjectNameGenerator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory.Support; /// diff --git a/src/Spring/Spring.Web/Objects/Factory/Support/RootWebObjectDefinition.cs b/src/Spring/Spring.Web/Objects/Factory/Support/RootWebObjectDefinition.cs index 150ad0f4..42b89d69 100644 --- a/src/Spring/Spring.Web/Objects/Factory/Support/RootWebObjectDefinition.cs +++ b/src/Spring/Spring.Web/Objects/Factory/Support/RootWebObjectDefinition.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Globalization; using Spring.Objects.Factory.Config; using Spring.Util; -#endregion - namespace Spring.Objects.Factory.Support; /// @@ -43,8 +35,6 @@ public class RootWebObjectDefinition : RootObjectDefinition, IWebObjectDefinitio // private ObjectScope _scope = ObjectScope.Default; private string _pageName; - #region Constructors - /// /// Creates a new instance of the /// class @@ -139,8 +129,6 @@ public class RootWebObjectDefinition : RootObjectDefinition, IWebObjectDefinitio } } - #endregion - /// /// Object scope. /// diff --git a/src/Spring/Spring.Web/Objects/Factory/Support/WebInstantiationStrategy.cs b/src/Spring/Spring.Web/Objects/Factory/Support/WebInstantiationStrategy.cs index 80f822c4..ae329ee9 100644 --- a/src/Spring/Spring.Web/Objects/Factory/Support/WebInstantiationStrategy.cs +++ b/src/Spring/Spring.Web/Objects/Factory/Support/WebInstantiationStrategy.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Objects.Factory.Support; /// diff --git a/src/Spring/Spring.Web/Objects/Factory/Support/WebObjectDefinitionFactory.cs b/src/Spring/Spring.Web/Objects/Factory/Support/WebObjectDefinitionFactory.cs index 9191d66e..6415c6e0 100644 --- a/src/Spring/Spring.Web/Objects/Factory/Support/WebObjectDefinitionFactory.cs +++ b/src/Spring/Spring.Web/Objects/Factory/Support/WebObjectDefinitionFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Core.TypeResolution; using Spring.Objects.Factory.Config; using Spring.Util; -#endregion - namespace Spring.Objects.Factory.Support; /// diff --git a/src/Spring/Spring.Web/Objects/Factory/Support/WebObjectFactory.cs b/src/Spring/Spring.Web/Objects/Factory/Support/WebObjectFactory.cs index aad36199..167f0b28 100644 --- a/src/Spring/Spring.Web/Objects/Factory/Support/WebObjectFactory.cs +++ b/src/Spring/Spring.Web/Objects/Factory/Support/WebObjectFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Web; using System.Web.Caching; @@ -31,8 +25,6 @@ using Spring.Context.Support; using Spring.Objects.Factory.Config; using Spring.Util; -#endregion - namespace Spring.Objects.Factory.Support; /// @@ -64,8 +56,6 @@ public class WebObjectFactory : DefaultListableObjectFactory /// private readonly ObjectDictionaryCreationHandler createObjectDictionary; - #region Constructor (s) / Destructor - static WebObjectFactory() { //EnsureEventHandlersRegistered(); @@ -123,8 +113,6 @@ public class WebObjectFactory : DefaultListableObjectFactory InstantiationStrategy = new WebInstantiationStrategy(); } - #endregion - /// /// Returns the virtual path this object factory is associated with. /// @@ -133,8 +121,6 @@ public class WebObjectFactory : DefaultListableObjectFactory get { return contextPath; } } - #region Convenience accessors for Http* objects - /// /// Convinience accessor for HttpContext /// @@ -185,8 +171,6 @@ public class WebObjectFactory : DefaultListableObjectFactory } } - #endregion - /// /// Creates a dictionary matching this factory's case sensitivity behaviour. /// diff --git a/src/Spring/Spring.Web/Objects/Factory/Support/WebObjectUtils.cs b/src/Spring/Spring.Web/Objects/Factory/Support/WebObjectUtils.cs index 297cac6d..a04f6743 100644 --- a/src/Spring/Spring.Web/Objects/Factory/Support/WebObjectUtils.cs +++ b/src/Spring/Spring.Web/Objects/Factory/Support/WebObjectUtils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Extensions.Logging; using Spring.Util; using IHttpHandler = System.Web.IHttpHandler; @@ -33,8 +29,6 @@ public sealed class WebObjectUtils { private static ILogger s_log = LogManager.GetLogger(typeof(WebObjectUtils)); - // CLOVER:OFF - /// /// Creates a new instance of the class. /// @@ -47,8 +41,6 @@ public sealed class WebObjectUtils { } - // CLOVER:ON - /// /// Creates an instance of the ASPX page /// referred to by the supplied . diff --git a/src/Spring/Spring.Web/Objects/Factory/Xml/WebObjectDefinitionDocumentReader.cs b/src/Spring/Spring.Web/Objects/Factory/Xml/WebObjectDefinitionDocumentReader.cs index 6de3aee1..8df3cc9c 100644 --- a/src/Spring/Spring.Web/Objects/Factory/Xml/WebObjectDefinitionDocumentReader.cs +++ b/src/Spring/Spring.Web/Objects/Factory/Xml/WebObjectDefinitionDocumentReader.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects.Factory.Support; using Spring.Util; diff --git a/src/Spring/Spring.Web/Objects/Factory/Xml/WebObjectDefinitionParserHelper.cs b/src/Spring/Spring.Web/Objects/Factory/Xml/WebObjectDefinitionParserHelper.cs index 545d1ea8..c87d31ab 100644 --- a/src/Spring/Spring.Web/Objects/Factory/Xml/WebObjectDefinitionParserHelper.cs +++ b/src/Spring/Spring.Web/Objects/Factory/Xml/WebObjectDefinitionParserHelper.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Xml; using Microsoft.Extensions.Logging; using Spring.Objects.Factory.Config; @@ -146,16 +142,12 @@ internal class WebObjectDefinitionParserHelper : ObjectDefinitionParserHelper } catch (ArgumentException ex) { - #region Instrumentation - if (log.IsEnabled(LogLevel.Debug)) { string message = string.Format("Error while parsing object scope : '{0}' is an invalid value.", value); log.LogDebug(ex, message); } - - #endregion } } diff --git a/src/Spring/Spring.Web/Objects/Factory/Xml/WebObjectDefinitionReader.cs b/src/Spring/Spring.Web/Objects/Factory/Xml/WebObjectDefinitionReader.cs index ca39e09d..872634a5 100644 --- a/src/Spring/Spring.Web/Objects/Factory/Xml/WebObjectDefinitionReader.cs +++ b/src/Spring/Spring.Web/Objects/Factory/Xml/WebObjectDefinitionReader.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Xml; using Spring.Objects.Factory.Support; using Spring.Util; diff --git a/src/Spring/Spring.Web/Util/HttpContextSwitch.cs b/src/Spring/Spring.Web/Util/HttpContextSwitch.cs index b7a8a857..9f8bdcdb 100644 --- a/src/Spring/Spring.Web/Util/HttpContextSwitch.cs +++ b/src/Spring/Spring.Web/Util/HttpContextSwitch.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Web; using Microsoft.Extensions.Logging; -#endregion - namespace Spring.Util; /// diff --git a/src/Spring/Spring.Web/Util/IVirtualEnvironment.cs b/src/Spring/Spring.Web/Util/IVirtualEnvironment.cs index 79394fa2..b52c3b81 100644 --- a/src/Spring/Spring.Web/Util/IVirtualEnvironment.cs +++ b/src/Spring/Spring.Web/Util/IVirtualEnvironment.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Collections.Specialized; using System.Web; -#endregion - namespace Spring.Util; /// diff --git a/src/Spring/Spring.Web/Util/SecurityCritical.cs b/src/Spring/Spring.Web/Util/SecurityCritical.cs index 83b16ee9..e044cc16 100644 --- a/src/Spring/Spring.Web/Util/SecurityCritical.cs +++ b/src/Spring/Spring.Web/Util/SecurityCritical.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.CompilerServices; using System.Security; diff --git a/src/Spring/Spring.Web/Util/VirtualEnvironment.cs b/src/Spring/Spring.Web/Util/VirtualEnvironment.cs index 264f3537..709be433 100644 --- a/src/Spring/Spring.Web/Util/VirtualEnvironment.cs +++ b/src/Spring/Spring.Web/Util/VirtualEnvironment.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Collections.Specialized; using System.Web; @@ -28,8 +22,6 @@ using System.Web.Compilation; using System.Web.SessionState; using Microsoft.Extensions.Logging; -#endregion - namespace Spring.Util; /// @@ -73,15 +65,11 @@ public sealed class VirtualEnvironment return prevEnvironment; } - #region default IVirtualEnvironment Adapter for HttpRuntime - /// /// Implementation for running within HttpRuntime /// private class HttpRuntimeEnvironment : IVirtualEnvironment { - #region HttpSessionState Adapter - private class SessionDictionaryAdapter : ISessionState { private readonly HttpSessionState _sessionState; @@ -229,8 +217,6 @@ public sealed class VirtualEnvironment #endif } - #endregion //HttpSessionState Adapter - private static readonly ILogger log = LogManager.GetLogger(typeof(HttpRuntimeEnvironment)); private class RewriteContext : IDisposable @@ -259,14 +245,10 @@ public sealed class VirtualEnvironment ctx.RewritePath(newPath, rebaseClientPath); - #region Instrumentation - if (log.IsEnabled(LogLevel.Debug)) { log.LogDebug("rewriting path from " + currentFileDirectory + " to " + newPath + " results in " + ctx.Request.FilePath); } - - #endregion } } @@ -379,8 +361,6 @@ public sealed class VirtualEnvironment } } - #endregion - /// /// The virtual (rooted) path of the current Application containing a leading '/' as well as a trailing '/' /// diff --git a/src/Spring/Spring.Web/Util/WebUtils.cs b/src/Spring/Spring.Web/Util/WebUtils.cs index aa16a39c..bbc8a386 100644 --- a/src/Spring/Spring.Web/Util/WebUtils.cs +++ b/src/Spring/Spring.Web/Util/WebUtils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Web; using System.Web.UI; -#endregion - namespace Spring.Util; /// @@ -33,10 +25,6 @@ namespace Spring.Util; /// Aleksandar Seovic public sealed class WebUtils { - #region Constructor (s) / Destructor - - // CLOVER:OFF - /// /// Creates a new instance of the class. /// @@ -49,10 +37,6 @@ public sealed class WebUtils { } - // CLOVER:ON - - #endregion - /// /// Default protocol used for resolving resources in web applications /// @@ -332,4 +316,4 @@ public sealed class WebUtils HttpContext ctx = HttpContext.Current; return (ctx == null) ? HttpUtility.UrlEncode(value) : ctx.Server.UrlEncode(value); } -} \ No newline at end of file +} diff --git a/src/Spring/Spring.Web/Web/Providers/ConfigurableActiveDirectoryMembershipProvider.cs b/src/Spring/Spring.Web/Web/Providers/ConfigurableActiveDirectoryMembershipProvider.cs index a7af9add..12c24dce 100644 --- a/src/Spring/Spring.Web/Web/Providers/ConfigurableActiveDirectoryMembershipProvider.cs +++ b/src/Spring/Spring.Web/Web/Providers/ConfigurableActiveDirectoryMembershipProvider.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - #if !MONO -#region Imports - -#endregion - namespace Spring.Web.Providers; /* TBD diff --git a/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlMembershipProvider.cs b/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlMembershipProvider.cs index d750b922..8be99a34 100644 --- a/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlMembershipProvider.cs +++ b/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlMembershipProvider.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections.Specialized; using System.Security.Permissions; using System.Web; using System.Web.Security; -#endregion - namespace Spring.Web.Providers; /// diff --git a/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlProfileProvider.cs b/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlProfileProvider.cs index bfeb6e9e..5bf16b48 100644 --- a/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlProfileProvider.cs +++ b/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlProfileProvider.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections.Specialized; using System.Security.Permissions; using System.Web; using System.Web.Profile; -#endregion - namespace Spring.Web.Providers; /// diff --git a/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlRoleProvider.cs b/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlRoleProvider.cs index f7e90a30..220a4823 100644 --- a/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlRoleProvider.cs +++ b/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlRoleProvider.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections.Specialized; using System.Security.Permissions; using System.Web; using System.Web.Security; -#endregion - namespace Spring.Web.Providers; /// diff --git a/src/Spring/Spring.Web/Web/Providers/ConfigurableXmlSiteMapProvider.cs b/src/Spring/Spring.Web/Web/Providers/ConfigurableXmlSiteMapProvider.cs index d6588d3a..3ae259c0 100644 --- a/src/Spring/Spring.Web/Web/Providers/ConfigurableXmlSiteMapProvider.cs +++ b/src/Spring/Spring.Web/Web/Providers/ConfigurableXmlSiteMapProvider.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections.Specialized; using System.Security.Permissions; using System.Web; using System.Web.Security; -#endregion - namespace Spring.Web.Providers; /// diff --git a/src/Spring/Spring.Web/Web/Providers/IMembershipProvider.cs b/src/Spring/Spring.Web/Web/Providers/IMembershipProvider.cs index 52b4e737..08d48836 100644 --- a/src/Spring/Spring.Web/Web/Providers/IMembershipProvider.cs +++ b/src/Spring/Spring.Web/Web/Providers/IMembershipProvider.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections.Specialized; using System.Web.Security; diff --git a/src/Spring/Spring.Web/Web/Providers/IProfileProvider.cs b/src/Spring/Spring.Web/Web/Providers/IProfileProvider.cs index 4642eb2d..1da65587 100644 --- a/src/Spring/Spring.Web/Web/Providers/IProfileProvider.cs +++ b/src/Spring/Spring.Web/Web/Providers/IProfileProvider.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections.Specialized; using System.Configuration; using System.Web.Profile; diff --git a/src/Spring/Spring.Web/Web/Providers/IRoleProvider.cs b/src/Spring/Spring.Web/Web/Providers/IRoleProvider.cs index d845ef81..15605fe5 100644 --- a/src/Spring/Spring.Web/Web/Providers/IRoleProvider.cs +++ b/src/Spring/Spring.Web/Web/Providers/IRoleProvider.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections.Specialized; -#endregion - namespace Spring.Web.Providers; /// diff --git a/src/Spring/Spring.Web/Web/Providers/ISiteMapProvider.cs b/src/Spring/Spring.Web/Web/Providers/ISiteMapProvider.cs index 524437e3..ad0127ae 100644 --- a/src/Spring/Spring.Web/Web/Providers/ISiteMapProvider.cs +++ b/src/Spring/Spring.Web/Web/Providers/ISiteMapProvider.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections.Specialized; using System.Web; -#endregion - namespace Spring.Web.Providers; /// diff --git a/src/Spring/Spring.Web/Web/Providers/MembershipProviderAdapter.cs b/src/Spring/Spring.Web/Web/Providers/MembershipProviderAdapter.cs index 884ff5b1..c50604c3 100644 --- a/src/Spring/Spring.Web/Web/Providers/MembershipProviderAdapter.cs +++ b/src/Spring/Spring.Web/Web/Providers/MembershipProviderAdapter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections.Specialized; using System.Security.Permissions; using System.Web; using System.Web.Security; using Spring.Context.Support; -#endregion - namespace Spring.Web.Providers; /// @@ -44,17 +36,11 @@ namespace Spring.Web.Providers; [AspNetHostingPermission(SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)] public class MembershipProviderAdapter : MembershipProvider, IMembershipProvider { - #region Field - /// /// Reference to wrapped provider (defined in Spring context). /// private MembershipProvider wrappedProvider; - #endregion - - #region ProviderBase members - /// ///Initializes the provider. /// @@ -109,10 +95,6 @@ public class MembershipProviderAdapter : MembershipProvider, IMembershipProvider get { return this.wrappedProvider.Description; } } - #endregion - - #region System.Web.Security.MembershipProvider members - /// ///Adds a new membership user to the data source. /// @@ -507,6 +489,4 @@ public class MembershipProviderAdapter : MembershipProvider, IMembershipProvider { get { return this.wrappedProvider.PasswordStrengthRegularExpression; } } - - #endregion } \ No newline at end of file diff --git a/src/Spring/Spring.Web/Web/Providers/ProfileProviderAdapter.cs b/src/Spring/Spring.Web/Web/Providers/ProfileProviderAdapter.cs index 93987dd2..c11fb7e7 100644 --- a/src/Spring/Spring.Web/Web/Providers/ProfileProviderAdapter.cs +++ b/src/Spring/Spring.Web/Web/Providers/ProfileProviderAdapter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections.Specialized; using System.Configuration; using System.Security.Permissions; @@ -41,17 +37,11 @@ namespace Spring.Web.Providers; [AspNetHostingPermission(SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)] public class ProfileProviderAdapter : ProfileProvider, IProfileProvider { - #region Field - /// /// Reference to wrapped provider (defined in Spring context). /// private ProfileProvider wrappedProvider; - #endregion - - #region ProviderBase members - /// ///Initializes the provider. /// @@ -104,10 +94,6 @@ public class ProfileProviderAdapter : ProfileProvider, IProfileProvider get { return this.wrappedProvider.Description; } } - #endregion - - #region System.Web.Profile.ProfileProvider members - /// ///Returns the collection of settings property values for the specified application instance and settings property group. /// @@ -292,6 +278,4 @@ public class ProfileProviderAdapter : ProfileProvider, IProfileProvider return this.wrappedProvider.FindInactiveProfilesByUserName(authenticationOption, usernameToMatch, userInactiveSinceDate, pageIndex, pageSize, out totalRecords); } - - #endregion } diff --git a/src/Spring/Spring.Web/Web/Providers/RoleProviderAdapter.cs b/src/Spring/Spring.Web/Web/Providers/RoleProviderAdapter.cs index b006ec95..537abbd3 100644 --- a/src/Spring/Spring.Web/Web/Providers/RoleProviderAdapter.cs +++ b/src/Spring/Spring.Web/Web/Providers/RoleProviderAdapter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections.Specialized; using System.Security.Permissions; using System.Web; using System.Web.Security; using Spring.Context.Support; -#endregion - namespace Spring.Web.Providers; /// @@ -44,17 +36,11 @@ namespace Spring.Web.Providers; [AspNetHostingPermission(SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)] public class RoleProviderAdapter : RoleProvider, IRoleProvider { - #region Field - /// /// Reference to wrapped provider (defined in Spring context). /// private RoleProvider wrappedProvider; - #endregion - - #region ProviderBase members - /// ///Initializes the provider. /// @@ -107,10 +93,6 @@ public class RoleProviderAdapter : RoleProvider, IRoleProvider get { return this.wrappedProvider.Description; } } - #endregion - - #region System.Web.Security.RoleProvider members - /// ///Gets a value indicating whether the specified user is in the specified role for the configured applicationName. /// @@ -256,6 +238,4 @@ public class RoleProviderAdapter : RoleProvider, IRoleProvider get { return this.wrappedProvider.ApplicationName; } set { this.wrappedProvider.ApplicationName = value; } } - - #endregion } \ No newline at end of file diff --git a/src/Spring/Spring.Web/Web/Providers/SiteMapProviderAdapter.cs b/src/Spring/Spring.Web/Web/Providers/SiteMapProviderAdapter.cs index d6e199b6..e0d90b00 100644 --- a/src/Spring/Spring.Web/Web/Providers/SiteMapProviderAdapter.cs +++ b/src/Spring/Spring.Web/Web/Providers/SiteMapProviderAdapter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections.Specialized; using System.Security.Permissions; using System.Web; using Spring.Context.Support; -#endregion - namespace Spring.Web.Providers; /// @@ -43,17 +35,11 @@ namespace Spring.Web.Providers; [AspNetHostingPermission(SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)] public class SiteMapProviderAdapter : SiteMapProvider, ISiteMapProvider { - #region Field - /// /// Reference to wrapped provider (defined in Spring context). /// private SiteMapProvider wrappedProvider; - #endregion - - #region ProviderBase members - /// ///Initializes the provider. /// @@ -105,10 +91,6 @@ public class SiteMapProviderAdapter : SiteMapProvider, ISiteMapProvider get { return this.wrappedProvider.Description; } } - #endregion - - #region System.Web.SiteMapProvider members - /// ///Retrieves a object that represents the currently requested page using the specified object. /// @@ -355,6 +337,4 @@ public class SiteMapProviderAdapter : SiteMapProvider, ISiteMapProvider { get { return this.wrappedProvider.RootNode; } } - - #endregion } diff --git a/src/Spring/Spring.Web/Web/Services/WebServiceExporter.cs b/src/Spring/Spring.Web/Web/Services/WebServiceExporter.cs index c04fb6a5..6b0536e3 100644 --- a/src/Spring/Spring.Web/Web/Services/WebServiceExporter.cs +++ b/src/Spring/Spring.Web/Web/Services/WebServiceExporter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Reflection; using System.Reflection.Emit; @@ -29,8 +23,6 @@ using Spring.Objects.Factory; using Spring.Util; using Spring.Proxy; -#endregion - namespace Spring.Web.Services; /// @@ -84,8 +76,6 @@ public class WebServiceExporter : IInitializingObject, IObjectFactoryAware, IObj return target; } - #region Fields - private WsiProfiles _wsiProfile = WsiProfiles.BasicProfile1_1; private readonly string EXPORTER_ID = Guid.NewGuid().ToString(); private Type _webServiceBaseType = typeof(WebService); @@ -112,10 +102,6 @@ public class WebServiceExporter : IInitializingObject, IObjectFactoryAware, IObj /// protected Type proxyType; - #endregion - - #region Constructor(s) / Destructor - /// /// Creates a new instance of the class. /// @@ -135,8 +121,6 @@ public class WebServiceExporter : IInitializingObject, IObjectFactoryAware, IObj Dispose(false); } - #region IDisposable Members - /// /// Disconnect the remote object from the registered remoting channels. /// @@ -163,12 +147,6 @@ public class WebServiceExporter : IInitializingObject, IObjectFactoryAware, IObj } } - #endregion - - #endregion - - #region Properties - /// /// Gets or Sets the Web Services Interoperability (WSI) specification /// to which the Web Service claims to conform. @@ -294,10 +272,6 @@ public class WebServiceExporter : IInitializingObject, IObjectFactoryAware, IObj set { _memberAttributes = value; } } - #endregion - - #region IObjectFactoryAware Members - /// /// Callback that supplies the owning factory to an object instance. /// @@ -323,10 +297,6 @@ public class WebServiceExporter : IInitializingObject, IObjectFactoryAware, IObj set { objectFactory = value; } } - #endregion - - #region IObjectNameAware Members - /// /// Set the name of the object in the object factory that created this object. /// @@ -347,10 +317,6 @@ public class WebServiceExporter : IInitializingObject, IObjectFactoryAware, IObj set { objectName = value; } } - #endregion - - #region IInitializingObject Members - /// /// Exports specified object as a web service. /// @@ -364,10 +330,6 @@ public class WebServiceExporter : IInitializingObject, IObjectFactoryAware, IObj GenerateProxy(); } - #endregion - - #region Methods - /// /// Returns the Web Service wrapper type for the object that is to be exposed. /// @@ -413,23 +375,13 @@ public class WebServiceExporter : IInitializingObject, IObjectFactoryAware, IObj return objectFactory.GetObject(TargetName); } - #endregion - - #region WebServiceProxyTypeBuilder inner class implementation - private sealed class WebServiceProxyTypeBuilder : CompositionProxyTypeBuilder { - #region Fields - private static readonly MethodInfo WebServiceExporter_GetTargetInstance = typeof(WebServiceExporter).GetMethod("GetTarget", new Type[] { typeof(string) }); private WebServiceExporter exporter; private CustomAttributeBuilder webServiceAttribute; private CustomAttributeBuilder webServiceBindingAttribute; - #endregion - - #region Constructor(s) / Destructor - public WebServiceProxyTypeBuilder(WebServiceExporter exporter, string description, string name, string ns) { this.exporter = exporter; @@ -483,10 +435,6 @@ public class WebServiceExporter : IInitializingObject, IObjectFactoryAware, IObj return cabb.Build(); } - #endregion - - #region Protected Methods - /// /// Implements constructors for the proxy class. /// @@ -578,9 +526,5 @@ public class WebServiceExporter : IInitializingObject, IObjectFactoryAware, IObj { return DynamicProxyManager.CreateTypeBuilder(name, baseType); } - - #endregion } - - #endregion } \ No newline at end of file diff --git a/src/Spring/Spring.Web/Web/Services/WebServiceHandlerFactory.cs b/src/Spring/Spring.Web/Web/Services/WebServiceHandlerFactory.cs index da5a399c..cea2f3b0 100644 --- a/src/Spring/Spring.Web/Web/Services/WebServiceHandlerFactory.cs +++ b/src/Spring/Spring.Web/Web/Services/WebServiceHandlerFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using System.Security.Permissions; using System.Web; @@ -36,8 +30,6 @@ using System.CodeDom.Compiler; using System.Collections; #endif -#endregion - namespace Spring.Web.Services; /// diff --git a/src/Spring/Spring.Web/Web/Support/AbstractHandlerFactory.cs b/src/Spring/Spring.Web/Web/Support/AbstractHandlerFactory.cs index 83faa72f..9103f592 100644 --- a/src/Spring/Spring.Web/Web/Support/AbstractHandlerFactory.cs +++ b/src/Spring/Spring.Web/Web/Support/AbstractHandlerFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Security; using System.Security.Permissions; @@ -32,8 +26,6 @@ using Spring.Context.Support; using Spring.Objects.Factory.Config; using Spring.Util; -#endregion - namespace Spring.Web.Support; /// @@ -49,8 +41,6 @@ namespace Spring.Web.Support; /// Aleksandar Seovic public abstract class AbstractHandlerFactory : IHttpHandlerFactory { - #region NamedObjectDefinition Utility - /// /// Holds a named /// @@ -86,8 +76,6 @@ public abstract class AbstractHandlerFactory : IHttpHandlerFactory } } - #endregion - /// /// Holds all handlers having == true. /// @@ -172,13 +160,9 @@ public abstract class AbstractHandlerFactory : IHttpHandlerFactory { bool isDebug = Log.IsEnabled(LogLevel.Debug); - #region Instrumentation - if (isDebug) Log.LogDebug(string.Format("GetHandler():resolving url '{0}'", url)); - #endregion - IHttpHandler handler = null; lock (_reusableHandlerCache.SyncRoot) { @@ -187,15 +171,11 @@ public abstract class AbstractHandlerFactory : IHttpHandlerFactory if (handler != null) { - #region Instrumentation - if (isDebug) { Log.LogDebug(string.Format("GetHandler():resolved url '{0}' from reusable handler cache", url)); } - #endregion - return handler; } diff --git a/src/Spring/Spring.Web/Web/Support/ContextMonitor.cs b/src/Spring/Spring.Web/Web/Support/ContextMonitor.cs index 4cc4bdce..b075a3d3 100644 --- a/src/Spring/Spring.Web/Web/Support/ContextMonitor.cs +++ b/src/Spring/Spring.Web/Web/Support/ContextMonitor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Web; using Spring.Context; using Spring.Context.Support; diff --git a/src/Spring/Spring.Web/Web/Support/ControlAccessor.cs b/src/Spring/Spring.Web/Web/Support/ControlAccessor.cs index d63db1ae..4908c046 100644 --- a/src/Spring/Spring.Web/Web/Support/ControlAccessor.cs +++ b/src/Spring/Spring.Web/Web/Support/ControlAccessor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Diagnostics; using System.Reflection; using System.Reflection.Emit; @@ -29,8 +23,6 @@ using System.Web.UI; using Spring.Reflection.Dynamic; using Spring.Util; -#endregion - namespace Spring.Web.Support; /// diff --git a/src/Spring/Spring.Web/Web/Support/ControlCollectionAccessor.cs b/src/Spring/Spring.Web/Web/Support/ControlCollectionAccessor.cs index b5e53fab..7175529b 100644 --- a/src/Spring/Spring.Web/Web/Support/ControlCollectionAccessor.cs +++ b/src/Spring/Spring.Web/Web/Support/ControlCollectionAccessor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using System.Security; using System.Security.Permissions; @@ -27,8 +21,6 @@ using System.Web.UI; using Spring.Reflection.Dynamic; using Spring.Util; -#endregion - namespace Spring.Web.Support; /// diff --git a/src/Spring/Spring.Web/Web/Support/ControlInterceptor.cs b/src/Spring/Spring.Web/Web/Support/ControlInterceptor.cs index ebe5ebab..4871c32d 100644 --- a/src/Spring/Spring.Web/Web/Support/ControlInterceptor.cs +++ b/src/Spring/Spring.Web/Web/Support/ControlInterceptor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Web.UI; using Microsoft.Extensions.Logging; using Spring.Context; -#endregion - namespace Spring.Web.Support; /// diff --git a/src/Spring/Spring.Web/Web/Support/DefaultHandlerFactory.cs b/src/Spring/Spring.Web/Web/Support/DefaultHandlerFactory.cs index bcb9e011..0a64e91f 100644 --- a/src/Spring/Spring.Web/Web/Support/DefaultHandlerFactory.cs +++ b/src/Spring/Spring.Web/Web/Support/DefaultHandlerFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Web; using Spring.Context; using Spring.Context.Support; using Spring.Util; -#endregion - namespace Spring.Web.Support; #if !MONO /// diff --git a/src/Spring/Spring.Web/Web/Support/DefaultResultFactory.cs b/src/Spring/Spring.Web/Web/Support/DefaultResultFactory.cs index 53990c5d..0d82a5eb 100644 --- a/src/Spring/Spring.Web/Web/Support/DefaultResultFactory.cs +++ b/src/Spring/Spring.Web/Web/Support/DefaultResultFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Web.Support; /// diff --git a/src/Spring/Spring.Web/Web/Support/DefaultResultWebNavigator.cs b/src/Spring/Spring.Web/Web/Support/DefaultResultWebNavigator.cs index 9566ff8d..358af82c 100644 --- a/src/Spring/Spring.Web/Web/Support/DefaultResultWebNavigator.cs +++ b/src/Spring/Spring.Web/Web/Support/DefaultResultWebNavigator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using Spring.Collections; using Spring.Core; -#endregion - namespace Spring.Web.Support; /// diff --git a/src/Spring/Spring.Web/Web/Support/HandlerMap.cs b/src/Spring/Spring.Web/Web/Support/HandlerMap.cs index 69228d8c..c3bedcf6 100644 --- a/src/Spring/Spring.Web/Web/Support/HandlerMap.cs +++ b/src/Spring/Spring.Web/Web/Support/HandlerMap.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Text.RegularExpressions; using System.Web; using Microsoft.Extensions.Logging; -#endregion - namespace Spring.Web.Support; /// @@ -184,8 +176,6 @@ public class HandlerMap : IDictionary return ((IEnumerable) this._internalTable).GetEnumerator(); } - #region Unsupported methods - /// /// Not supported by this implementation. /// @@ -231,6 +221,4 @@ public class HandlerMap : IDictionary throw new NotSupportedException(); } } - - #endregion } diff --git a/src/Spring/Spring.Web/Web/Support/HandlerMapEntry.cs b/src/Spring/Spring.Web/Web/Support/HandlerMapEntry.cs index 86c75443..9fd52feb 100644 --- a/src/Spring/Spring.Web/Web/Support/HandlerMapEntry.cs +++ b/src/Spring/Spring.Web/Web/Support/HandlerMapEntry.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Text.RegularExpressions; using Spring.Util; -#endregion - namespace Spring.Web.Support; /// diff --git a/src/Spring/Spring.Web/Web/Support/IHierarchicalWebNavigator.cs b/src/Spring/Spring.Web/Web/Support/IHierarchicalWebNavigator.cs index e9ac84d1..2a62cb4b 100644 --- a/src/Spring/Spring.Web/Web/Support/IHierarchicalWebNavigator.cs +++ b/src/Spring/Spring.Web/Web/Support/IHierarchicalWebNavigator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Web.Support; /// diff --git a/src/Spring/Spring.Web/Web/Support/IInterceptionStrategy.cs b/src/Spring/Spring.Web/Web/Support/IInterceptionStrategy.cs index b77ee678..b3e81e24 100644 --- a/src/Spring/Spring.Web/Web/Support/IInterceptionStrategy.cs +++ b/src/Spring/Spring.Web/Web/Support/IInterceptionStrategy.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Context; -#endregion - namespace Spring.Web.Support; /// diff --git a/src/Spring/Spring.Web/Web/Support/IResult.cs b/src/Spring/Spring.Web/Web/Support/IResult.cs index c192003b..f24749ff 100644 --- a/src/Spring/Spring.Web/Web/Support/IResult.cs +++ b/src/Spring/Spring.Web/Web/Support/IResult.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Web; using Spring.Web.UI; -#endregion - namespace Spring.Web.Support; /// diff --git a/src/Spring/Spring.Web/Web/Support/IResultFactory.cs b/src/Spring/Spring.Web/Web/Support/IResultFactory.cs index 1aec1a1c..30f4ae2c 100644 --- a/src/Spring/Spring.Web/Web/Support/IResultFactory.cs +++ b/src/Spring/Spring.Web/Web/Support/IResultFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Web.Support; /// diff --git a/src/Spring/Spring.Web/Web/Support/IResultWebNavigator.cs b/src/Spring/Spring.Web/Web/Support/IResultWebNavigator.cs index 74e5e3b1..1dc3a4f6 100644 --- a/src/Spring/Spring.Web/Web/Support/IResultWebNavigator.cs +++ b/src/Spring/Spring.Web/Web/Support/IResultWebNavigator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; -#endregion - namespace Spring.Web.Support; /// diff --git a/src/Spring/Spring.Web/Web/Support/ISupportsWebDependencyInjection.cs b/src/Spring/Spring.Web/Web/Support/ISupportsWebDependencyInjection.cs index cbd401fb..7c7b8071 100644 --- a/src/Spring/Spring.Web/Web/Support/ISupportsWebDependencyInjection.cs +++ b/src/Spring/Spring.Web/Web/Support/ISupportsWebDependencyInjection.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Context; -#endregion - namespace Spring.Web.Support; /// diff --git a/src/Spring/Spring.Web/Web/Support/IWebNavigable.cs b/src/Spring/Spring.Web/Web/Support/IWebNavigable.cs index 4e7453ee..bb5e5b4e 100644 --- a/src/Spring/Spring.Web/Web/Support/IWebNavigable.cs +++ b/src/Spring/Spring.Web/Web/Support/IWebNavigable.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Web.Support; /// diff --git a/src/Spring/Spring.Web/Web/Support/IWebNavigator.cs b/src/Spring/Spring.Web/Web/Support/IWebNavigator.cs index b9e8e075..eb22977c 100644 --- a/src/Spring/Spring.Web/Web/Support/IWebNavigator.cs +++ b/src/Spring/Spring.Web/Web/Support/IWebNavigator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Web.Support; /// diff --git a/src/Spring/Spring.Web/Web/Support/InterceptControlCollectionOwnerStrategy.cs b/src/Spring/Spring.Web/Web/Support/InterceptControlCollectionOwnerStrategy.cs index f3c29a0f..825215c2 100644 --- a/src/Spring/Spring.Web/Web/Support/InterceptControlCollectionOwnerStrategy.cs +++ b/src/Spring/Spring.Web/Web/Support/InterceptControlCollectionOwnerStrategy.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Web.UI; using Spring.Context; -#endregion - namespace Spring.Web.Support; /// diff --git a/src/Spring/Spring.Web/Web/Support/InterceptControlCollectionStrategy.cs b/src/Spring/Spring.Web/Web/Support/InterceptControlCollectionStrategy.cs index 174aadbf..0c01d0eb 100644 --- a/src/Spring/Spring.Web/Web/Support/InterceptControlCollectionStrategy.cs +++ b/src/Spring/Spring.Web/Web/Support/InterceptControlCollectionStrategy.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Reflection; using System.Reflection.Emit; @@ -28,8 +22,6 @@ using Spring.Context; using Spring.Proxy; using Spring.Util; -#endregion - namespace Spring.Web.Support; /// diff --git a/src/Spring/Spring.Web/Web/Support/LocalResourceManager.cs b/src/Spring/Spring.Web/Web/Support/LocalResourceManager.cs index 7e386c96..6dd68812 100644 --- a/src/Spring/Spring.Web/Web/Support/LocalResourceManager.cs +++ b/src/Spring/Spring.Web/Web/Support/LocalResourceManager.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Globalization; using System.Reflection; using System.Resources; @@ -31,8 +25,6 @@ using System.Web.UI; using Spring.Reflection.Dynamic; using Spring.Util; -#endregion - namespace Spring.Web.Support; /// @@ -109,8 +101,6 @@ internal abstract class LocalResourceManager : ResourceManager return localResourceAssembly; } - #region ResourceProviderResourceManager - private class ResourceProviderResourceManager : ResourceManager { private bool _hasException; @@ -172,10 +162,6 @@ internal abstract class LocalResourceManager : ResourceManager } } - #endregion - - #region LocalResXAssemblyResourceManager - private class LocalResXAssemblyResourceManager : ResourceManager { private bool _isMissingManifest = false; @@ -227,6 +213,4 @@ internal abstract class LocalResourceManager : ResourceManager return null; } } - - #endregion } diff --git a/src/Spring/Spring.Web/Web/Support/MappingHandlerFactory.cs b/src/Spring/Spring.Web/Web/Support/MappingHandlerFactory.cs index 58f41a2f..fb179906 100644 --- a/src/Spring/Spring.Web/Web/Support/MappingHandlerFactory.cs +++ b/src/Spring/Spring.Web/Web/Support/MappingHandlerFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Net; using System.Web; using Spring.Context; -#endregion - namespace Spring.Web.Support; /// diff --git a/src/Spring/Spring.Web/Web/Support/MappingHandlerFactoryConfigurer.cs b/src/Spring/Spring.Web/Web/Support/MappingHandlerFactoryConfigurer.cs index bae4575f..d289a9d7 100644 --- a/src/Spring/Spring.Web/Web/Support/MappingHandlerFactoryConfigurer.cs +++ b/src/Spring/Spring.Web/Web/Support/MappingHandlerFactoryConfigurer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Web.Support; /// @@ -50,9 +42,7 @@ public class MappingHandlerFactoryConfigurer // } } - #region IObjectPostProcessor implementation - -// object IObjectPostProcessor.PostProcessBeforeInitialization(object instance, string name) + // object IObjectPostProcessor.PostProcessBeforeInitialization(object instance, string name) // { // return instance; // } @@ -61,6 +51,4 @@ public class MappingHandlerFactoryConfigurer // { // return instance; // } - - #endregion } diff --git a/src/Spring/Spring.Web/Web/Support/MimeMediaType.cs b/src/Spring/Spring.Web/Web/Support/MimeMediaType.cs index 5d07b799..3a00ae47 100644 --- a/src/Spring/Spring.Web/Web/Support/MimeMediaType.cs +++ b/src/Spring/Spring.Web/Web/Support/MimeMediaType.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Util; -#endregion - namespace Spring.Web.Support; /// @@ -34,8 +26,6 @@ public class MimeMediaType { private static readonly List ContentTypes = new List(new string[] { "application", "audio", "example", "image", "message", "model", "multipart", "text", "video" }); - #region Predefined Instances - /// /// Predefines common application media types /// @@ -124,10 +114,6 @@ public class MimeMediaType public static readonly MimeMediaType Css = Parse("text/css"); } - #endregion - - #region Static Methods - /// /// Parses a string into a instance. /// @@ -153,8 +139,6 @@ public class MimeMediaType } } - #endregion Static Methods - private readonly string _contentType; private readonly string _subType; diff --git a/src/Spring/Spring.Web/Web/Support/PageHandlerFactory.cs b/src/Spring/Spring.Web/Web/Support/PageHandlerFactory.cs index c8614715..007edbd3 100644 --- a/src/Spring/Spring.Web/Web/Support/PageHandlerFactory.cs +++ b/src/Spring/Spring.Web/Web/Support/PageHandlerFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Web; using Spring.Context; @@ -28,8 +22,6 @@ using Spring.Objects; using Spring.Objects.Factory.Support; using Spring.Util; -#endregion - namespace Spring.Web.Support; /// diff --git a/src/Spring/Spring.Web/Web/Support/Result.cs b/src/Spring/Spring.Web/Web/Support/Result.cs index fb40bc63..77c50ae0 100644 --- a/src/Spring/Spring.Web/Web/Support/Result.cs +++ b/src/Spring/Spring.Web/Web/Support/Result.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Text; using System.Web; @@ -27,8 +21,6 @@ using Spring.Collections; using Spring.Expressions; using Spring.Util; -#endregion - namespace Spring.Web.Support; /// @@ -75,8 +67,6 @@ namespace Spring.Web.Support; [Serializable] public class Result : IResult { - #region Constants - /// /// The default . /// @@ -88,18 +78,10 @@ public class Result : IResult /// public const ResultMode DefaultResultMode = ResultMode.Transfer; - #endregion - - #region Fields - private ResultMode mode = DefaultResultMode; private string targetPage; private IDictionary parameters; - #endregion - - #region Constructor (s) / Destructor - /// /// Creates a new instance of the class. /// @@ -175,10 +157,6 @@ public class Result : IResult targetPage = result.Trim(); } - #endregion - - #region Properties - /// /// The . Defines which /// method will be used to navigate to the @@ -244,8 +222,6 @@ public class Result : IResult get { return (Mode == ResultMode.Redirect); } } - #endregion - /// /// Navigates to the /// defined by this result. diff --git a/src/Spring/Spring.Web/Web/Support/ResultFactoryRegistry.cs b/src/Spring/Spring.Web/Web/Support/ResultFactoryRegistry.cs index fa875aa2..bbceaea1 100644 --- a/src/Spring/Spring.Web/Web/Support/ResultFactoryRegistry.cs +++ b/src/Spring/Spring.Web/Web/Support/ResultFactoryRegistry.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using Spring.Collections; using Spring.Util; using Spring.Web.UI; -#endregion - namespace Spring.Web.Support; /// diff --git a/src/Spring/Spring.Web/Web/Support/ResultMode.cs b/src/Spring/Spring.Web/Web/Support/ResultMode.cs index 5ec2df1b..74bc3964 100644 --- a/src/Spring/Spring.Web/Web/Support/ResultMode.cs +++ b/src/Spring/Spring.Web/Web/Support/ResultMode.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Web.Support; /// diff --git a/src/Spring/Spring.Web/Web/Support/Script.cs b/src/Spring/Spring.Web/Web/Support/Script.cs index b8da1ab3..83551cba 100644 --- a/src/Spring/Spring.Web/Web/Support/Script.cs +++ b/src/Spring/Spring.Web/Web/Support/Script.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Util; namespace Spring.Web.Support; diff --git a/src/Spring/Spring.Web/Web/Support/SharedStateResourceCache.cs b/src/Spring/Spring.Web/Web/Support/SharedStateResourceCache.cs index 64548029..2007f2f2 100644 --- a/src/Spring/Spring.Web/Web/Support/SharedStateResourceCache.cs +++ b/src/Spring/Spring.Web/Web/Support/SharedStateResourceCache.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Globalization; using Spring.Objects; using Spring.Util; -#endregion - namespace Spring.Web.Support; /// diff --git a/src/Spring/Spring.Web/Web/Support/SupportsWebDependencyInjectionMethodBuilder.cs b/src/Spring/Spring.Web/Web/Support/SupportsWebDependencyInjectionMethodBuilder.cs index 21119bc8..ed6a20ed 100644 --- a/src/Spring/Spring.Web/Web/Support/SupportsWebDependencyInjectionMethodBuilder.cs +++ b/src/Spring/Spring.Web/Web/Support/SupportsWebDependencyInjectionMethodBuilder.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using System.Reflection.Emit; using Spring.Proxy; -#endregion - namespace Spring.Web.Support; /// diff --git a/src/Spring/Spring.Web/Web/Support/SupportsWebDependencyInjectionOwnerProxy.cs b/src/Spring/Spring.Web/Web/Support/SupportsWebDependencyInjectionOwnerProxy.cs index 34af8a51..dac0d8db 100644 --- a/src/Spring/Spring.Web/Web/Support/SupportsWebDependencyInjectionOwnerProxy.cs +++ b/src/Spring/Spring.Web/Web/Support/SupportsWebDependencyInjectionOwnerProxy.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using System.Security; using System.Security.Permissions; @@ -28,8 +22,6 @@ using Spring.Context; using Spring.Reflection.Dynamic; using Spring.Util; -#endregion - namespace Spring.Web.Support; /// diff --git a/src/Spring/Spring.Web/Web/Support/SupportsWebDependencyInjectionTypeBuilder.cs b/src/Spring/Spring.Web/Web/Support/SupportsWebDependencyInjectionTypeBuilder.cs index e3bbf9ce..77ea4d8c 100644 --- a/src/Spring/Spring.Web/Web/Support/SupportsWebDependencyInjectionTypeBuilder.cs +++ b/src/Spring/Spring.Web/Web/Support/SupportsWebDependencyInjectionTypeBuilder.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using System.Reflection.Emit; using Spring.Context; using Spring.Proxy; using Spring.Util; -#endregion - namespace Spring.Web.Support; /// @@ -175,8 +167,6 @@ internal class SupportsWebDependencyInjectionTypeBuilder : InheritanceProxyTypeB return applicationContextField; } - #region Public Methods - /// /// Determines if the specified /// is one of those generated by this builder. @@ -190,6 +180,4 @@ internal class SupportsWebDependencyInjectionTypeBuilder : InheritanceProxyTypeB { return type.FullName.StartsWith(PROXY_TYPE_NAME); } - - #endregion } \ No newline at end of file diff --git a/src/Spring/Spring.Web/Web/Support/WebDependencyInjectionUtils.cs b/src/Spring/Spring.Web/Web/Support/WebDependencyInjectionUtils.cs index 0f062e57..07ef430e 100644 --- a/src/Spring/Spring.Web/Web/Support/WebDependencyInjectionUtils.cs +++ b/src/Spring/Spring.Web/Web/Support/WebDependencyInjectionUtils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Web.UI; using Spring.Context; using Spring.Context.Support; diff --git a/src/Spring/Spring.Web/Web/Support/WebFormsResultWebNavigator.cs b/src/Spring/Spring.Web/Web/Support/WebFormsResultWebNavigator.cs index 13150bd9..941de0fc 100644 --- a/src/Spring/Spring.Web/Web/Support/WebFormsResultWebNavigator.cs +++ b/src/Spring/Spring.Web/Web/Support/WebFormsResultWebNavigator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Web.UI; using Spring.Util; -#endregion - namespace Spring.Web.Support; /// diff --git a/src/Spring/Spring.Web/Web/Support/WebNavigableWebNavigatorAdapter.cs b/src/Spring/Spring.Web/Web/Support/WebNavigableWebNavigatorAdapter.cs index d9d8cc8a..5ca4974d 100644 --- a/src/Spring/Spring.Web/Web/Support/WebNavigableWebNavigatorAdapter.cs +++ b/src/Spring/Spring.Web/Web/Support/WebNavigableWebNavigatorAdapter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Web.Support; /// diff --git a/src/Spring/Spring.Web/Web/UI/AbstractWizard.cs b/src/Spring/Spring.Web/Web/UI/AbstractWizard.cs index 76366a53..935323ee 100644 --- a/src/Spring/Spring.Web/Web/UI/AbstractWizard.cs +++ b/src/Spring/Spring.Web/Web/UI/AbstractWizard.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Web.UI; using System.Web.UI.WebControls; @@ -54,8 +50,6 @@ public abstract class AbstractWizard : Page set { steps = value; } } - #region Wizard navigation members - /// /// Gets or sets current step using step index. /// @@ -111,10 +105,6 @@ public abstract class AbstractWizard : Page } } - #endregion - - #region Page lifecycle methods - /// /// Initializes wizard steps. /// @@ -176,14 +166,8 @@ public abstract class AbstractWizard : Page return step; } - #endregion - - #region Abstract members - /// /// Panel that should serve as a container for wizard steps. /// protected abstract Panel StepPanel { get; } - - #endregion } diff --git a/src/Spring/Spring.Web/Web/UI/Controls/AbstractBaseValidator.cs b/src/Spring/Spring.Web/Web/UI/Controls/AbstractBaseValidator.cs index 62626d1c..eadd28bc 100644 --- a/src/Spring/Spring.Web/Web/UI/Controls/AbstractBaseValidator.cs +++ b/src/Spring/Spring.Web/Web/UI/Controls/AbstractBaseValidator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Import - using System.Reflection; using System.Web.UI; using System.Web.UI.WebControls; -#endregion - namespace Spring.Web.UI.Controls; /// diff --git a/src/Spring/Spring.Web/Web/UI/Controls/AbstractValidationControl.cs b/src/Spring/Spring.Web/Web/UI/Controls/AbstractValidationControl.cs index 93c4e8bb..301df512 100644 --- a/src/Spring/Spring.Web/Web/UI/Controls/AbstractValidationControl.cs +++ b/src/Spring/Spring.Web/Web/UI/Controls/AbstractValidationControl.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Web.UI; using Spring.Context; using Spring.Util; diff --git a/src/Spring/Spring.Web/Web/UI/Controls/Calendar.cs b/src/Spring/Spring.Web/Web/UI/Controls/Calendar.cs index a7777c6e..6aa91cfe 100644 --- a/src/Spring/Spring.Web/Web/UI/Controls/Calendar.cs +++ b/src/Spring/Spring.Web/Web/UI/Controls/Calendar.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections.Specialized; using System.Web.UI; using System.Web.UI.WebControls; using Spring.Util; -#endregion - namespace Spring.Web.UI.Controls; /// @@ -217,8 +209,6 @@ public class Calendar : WebControl, IPostBackDataHandler writer.RenderEndTag(); } - #region IPostBackDataHandler Members - /// /// Raises the SelectionChanged event. /// @@ -264,8 +254,6 @@ public class Calendar : WebControl, IPostBackDataHandler return changed; } - #endregion - /// /// The method that is called on postback if the date has changed. /// diff --git a/src/Spring/Spring.Web/Web/UI/Controls/CheckBoxList.cs b/src/Spring/Spring.Web/Web/UI/Controls/CheckBoxList.cs index cb044575..2cc00155 100644 --- a/src/Spring/Spring.Web/Web/UI/Controls/CheckBoxList.cs +++ b/src/Spring/Spring.Web/Web/UI/Controls/CheckBoxList.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Web.UI.WebControls; -#endregion - namespace Spring.Web.UI.Controls; /// diff --git a/src/Spring/Spring.Web/Web/UI/Controls/CheckBoxValidator.cs b/src/Spring/Spring.Web/Web/UI/Controls/CheckBoxValidator.cs index 045e7f26..8513906c 100644 --- a/src/Spring/Spring.Web/Web/UI/Controls/CheckBoxValidator.cs +++ b/src/Spring/Spring.Web/Web/UI/Controls/CheckBoxValidator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Web.UI; using System.Web.UI.WebControls; -#endregion - namespace Spring.Web.UI.Controls; /// diff --git a/src/Spring/Spring.Web/Web/UI/Controls/Content.cs b/src/Spring/Spring.Web/Web/UI/Controls/Content.cs index a6763323..cafd5e3b 100644 --- a/src/Spring/Spring.Web/Web/UI/Controls/Content.cs +++ b/src/Spring/Spring.Web/Web/UI/Controls/Content.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Web.UI.Controls; /// diff --git a/src/Spring/Spring.Web/Web/UI/Controls/ContentPlaceholder.cs b/src/Spring/Spring.Web/Web/UI/Controls/ContentPlaceholder.cs index 154b284f..a8cbb6dc 100644 --- a/src/Spring/Spring.Web/Web/UI/Controls/ContentPlaceholder.cs +++ b/src/Spring/Spring.Web/Web/UI/Controls/ContentPlaceholder.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Web.UI.Controls; /// diff --git a/src/Spring/Spring.Web/Web/UI/Controls/ContentReplacer.cs b/src/Spring/Spring.Web/Web/UI/Controls/ContentReplacer.cs index f83cc94e..07f97e21 100644 --- a/src/Spring/Spring.Web/Web/UI/Controls/ContentReplacer.cs +++ b/src/Spring/Spring.Web/Web/UI/Controls/ContentReplacer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using System.Web.UI; using Microsoft.Extensions.Logging; diff --git a/src/Spring/Spring.Web/Web/UI/Controls/DataBindingPanel.cs b/src/Spring/Spring.Web/Web/UI/Controls/DataBindingPanel.cs index d42b1fb8..fce6f2d7 100644 --- a/src/Spring/Spring.Web/Web/UI/Controls/DataBindingPanel.cs +++ b/src/Spring/Spring.Web/Web/UI/Controls/DataBindingPanel.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.ComponentModel; using System.Reflection; using System.Security.Permissions; @@ -34,8 +28,6 @@ using Spring.Util; using AttributeCollection = System.Web.UI.AttributeCollection; using BindingDirection = Spring.DataBinding.BindingDirection; -#endregion - namespace Spring.Web.UI.Controls; /// diff --git a/src/Spring/Spring.Web/Web/UI/Controls/Form.cs b/src/Spring/Spring.Web/Web/UI/Controls/Form.cs index 9d509d60..612c4287 100644 --- a/src/Spring/Spring.Web/Web/UI/Controls/Form.cs +++ b/src/Spring/Spring.Web/Web/UI/Controls/Form.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Web; using System.Web.UI; using System.Web.UI.HtmlControls; using Spring.Util; -#endregion - namespace Spring.Web.UI.Controls; /// @@ -90,8 +82,6 @@ public class Form : HtmlForm } } - #region Nested type: ActionSupressingHtmlTextWriter - /// /// This wrapper suppresses output of 'action' attributes. /// @@ -110,6 +100,4 @@ public class Form : HtmlForm } } } - - #endregion } diff --git a/src/Spring/Spring.Web/Web/UI/Controls/Head.cs b/src/Spring/Spring.Web/Web/UI/Controls/Head.cs index 2a503a5d..4e64e269 100644 --- a/src/Spring/Spring.Web/Web/UI/Controls/Head.cs +++ b/src/Spring/Spring.Web/Web/UI/Controls/Head.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Web.UI; using Spring.Util; diff --git a/src/Spring/Spring.Web/Web/UI/Controls/LocalizedImage.cs b/src/Spring/Spring.Web/Web/UI/Controls/LocalizedImage.cs index 1adb5b5d..cb420b05 100644 --- a/src/Spring/Spring.Web/Web/UI/Controls/LocalizedImage.cs +++ b/src/Spring/Spring.Web/Web/UI/Controls/LocalizedImage.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Web.UI.Controls; /// diff --git a/src/Spring/Spring.Web/Web/UI/Controls/Panel.cs b/src/Spring/Spring.Web/Web/UI/Controls/Panel.cs index 11a9ee43..8ed93db6 100644 --- a/src/Spring/Spring.Web/Web/UI/Controls/Panel.cs +++ b/src/Spring/Spring.Web/Web/UI/Controls/Panel.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.ComponentModel; using System.Security.Permissions; using System.Web; @@ -28,8 +22,6 @@ using Spring.Context; using Spring.Context.Support; using Spring.Web.Support; -#endregion - namespace Spring.Web.UI.Controls; /// @@ -173,8 +165,6 @@ public class Panel : System.Web.UI.WebControls.Panel, ISupportsWebDependencyInje get { return base.Context; } } - #region Dependency Injection Support - private IApplicationContext _defaultApplicationContext; /// @@ -218,6 +208,4 @@ public class Panel : System.Web.UI.WebControls.Panel, ISupportsWebDependencyInje return new InitRecursiveInterceptingControlsCollection(this); } } - - #endregion Dependency Injection Support } diff --git a/src/Spring/Spring.Web/Web/UI/Controls/RadioButtonGroup.cs b/src/Spring/Spring.Web/Web/UI/Controls/RadioButtonGroup.cs index cd42b221..4696ea24 100644 --- a/src/Spring/Spring.Web/Web/UI/Controls/RadioButtonGroup.cs +++ b/src/Spring/Spring.Web/Web/UI/Controls/RadioButtonGroup.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections.Specialized; using System.ComponentModel; using System.Web.UI; @@ -139,8 +135,6 @@ public class RadioButtonGroup : WebControl, IPostBackDataHandler this.RenderChildren(writer); } - #region IPostBackDataHandler Members - /// /// Loads postback data into the control. /// @@ -168,8 +162,6 @@ public class RadioButtonGroup : WebControl, IPostBackDataHandler OnSelectionChanged(EventArgs.Empty); } - #endregion - /// /// Method that is called on postback if selected radio button has changed. /// diff --git a/src/Spring/Spring.Web/Web/UI/Controls/TabCommandEventArgs.cs b/src/Spring/Spring.Web/Web/UI/Controls/TabCommandEventArgs.cs index 5ab1639a..12bb574d 100644 --- a/src/Spring/Spring.Web/Web/UI/Controls/TabCommandEventArgs.cs +++ b/src/Spring/Spring.Web/Web/UI/Controls/TabCommandEventArgs.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - using System.Web.UI.WebControls; namespace Spring.Web.UI.Controls; diff --git a/src/Spring/Spring.Web/Web/UI/Controls/TabCommandEventHandler.cs b/src/Spring/Spring.Web/Web/UI/Controls/TabCommandEventHandler.cs index c6f9d7cf..2f87cc2d 100644 --- a/src/Spring/Spring.Web/Web/UI/Controls/TabCommandEventHandler.cs +++ b/src/Spring/Spring.Web/Web/UI/Controls/TabCommandEventHandler.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Web.UI.Controls; /// diff --git a/src/Spring/Spring.Web/Web/UI/Controls/TabContainer.cs b/src/Spring/Spring.Web/Web/UI/Controls/TabContainer.cs index b15352b4..a59db758 100644 --- a/src/Spring/Spring.Web/Web/UI/Controls/TabContainer.cs +++ b/src/Spring/Spring.Web/Web/UI/Controls/TabContainer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Web.UI; using System.Web.UI.WebControls; -#endregion - namespace Spring.Web.UI.Controls; /// diff --git a/src/Spring/Spring.Web/Web/UI/Controls/TabularMultiView.cs b/src/Spring/Spring.Web/Web/UI/Controls/TabularMultiView.cs index 949adb0b..b425f6dc 100644 --- a/src/Spring/Spring.Web/Web/UI/Controls/TabularMultiView.cs +++ b/src/Spring/Spring.Web/Web/UI/Controls/TabularMultiView.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.ComponentModel; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; -#endregion - namespace Spring.Web.UI.Controls; /// @@ -39,8 +31,6 @@ namespace Spring.Web.UI.Controls; [ParseChildren(false)] public class TabularMultiView : WebControl { - #region Style Properties - private string m_MenuStyle = "TabMenu"; private string m_BodyStyle = "TabBody"; private string m_TabItemStyle = "TabItem"; @@ -86,10 +76,6 @@ public class TabularMultiView : WebControl set { m_BodyStyle = value; } } - #endregion - - #region Public Members - /// /// Initializes a new instance. /// @@ -144,10 +130,6 @@ public class TabularMultiView : WebControl remove { base.Events.RemoveHandler(_eventActiveTabChanged, value); } } - #endregion Public Members - - #region Customizable Members - /// /// Create the container for tab items. /// @@ -176,10 +158,6 @@ public class TabularMultiView : WebControl return content; } - #endregion - - #region Fields - private static readonly object _eventActiveTabChanged = new object(); private int _activeViewIndexCached = -1; @@ -193,8 +171,6 @@ public class TabularMultiView : WebControl /// private ArrayList _parsedViews = new ArrayList(); - #endregion - /// /// Initialize this control. /// diff --git a/src/Spring/Spring.Web/Web/UI/Controls/TabularView.cs b/src/Spring/Spring.Web/Web/UI/Controls/TabularView.cs index 04f4936c..8c6ec820 100644 --- a/src/Spring/Spring.Web/Web/UI/Controls/TabularView.cs +++ b/src/Spring/Spring.Web/Web/UI/Controls/TabularView.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using System.ComponentModel; using System.Web.UI; using System.Web.UI.WebControls; -#endregion - namespace Spring.Web.UI.Controls; /// diff --git a/src/Spring/Spring.Web/Web/UI/Controls/TabularViewCollection.cs b/src/Spring/Spring.Web/Web/UI/Controls/TabularViewCollection.cs index 45e22213..54641026 100644 --- a/src/Spring/Spring.Web/Web/UI/Controls/TabularViewCollection.cs +++ b/src/Spring/Spring.Web/Web/UI/Controls/TabularViewCollection.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Security.Permissions; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; -#endregion - namespace Spring.Web.UI.Controls; /// diff --git a/src/Spring/Spring.Web/Web/UI/Controls/ValidationError.cs b/src/Spring/Spring.Web/Web/UI/Controls/ValidationError.cs index 660f8496..7af1e658 100644 --- a/src/Spring/Spring.Web/Web/UI/Controls/ValidationError.cs +++ b/src/Spring/Spring.Web/Web/UI/Controls/ValidationError.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Web.UI.Validation; -#endregion - namespace Spring.Web.UI.Controls; /// diff --git a/src/Spring/Spring.Web/Web/UI/Controls/ValidationSummary.cs b/src/Spring/Spring.Web/Web/UI/Controls/ValidationSummary.cs index 8c3baa9b..dbca5527 100644 --- a/src/Spring/Spring.Web/Web/UI/Controls/ValidationSummary.cs +++ b/src/Spring/Spring.Web/Web/UI/Controls/ValidationSummary.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Web.UI.Validation; -#endregion - namespace Spring.Web.UI.Controls; /// diff --git a/src/Spring/Spring.Web/Web/UI/DialogAttribute.cs b/src/Spring/Spring.Web/Web/UI/DialogAttribute.cs index f610d696..38181bbb 100644 --- a/src/Spring/Spring.Web/Web/UI/DialogAttribute.cs +++ b/src/Spring/Spring.Web/Web/UI/DialogAttribute.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Web.UI; /// diff --git a/src/Spring/Spring.Web/Web/UI/IModelPersistenceMedium.cs b/src/Spring/Spring.Web/Web/UI/IModelPersistenceMedium.cs index eed6c31a..1938febe 100644 --- a/src/Spring/Spring.Web/Web/UI/IModelPersistenceMedium.cs +++ b/src/Spring/Spring.Web/Web/UI/IModelPersistenceMedium.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Web.UI; -#endregion - namespace Spring.Web.UI; /// diff --git a/src/Spring/Spring.Web/Web/UI/IValidationContainer.cs b/src/Spring/Spring.Web/Web/UI/IValidationContainer.cs index 76cb7012..5915fd28 100644 --- a/src/Spring/Spring.Web/Web/UI/IValidationContainer.cs +++ b/src/Spring/Spring.Web/Web/UI/IValidationContainer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Context; using Spring.Validation; -#endregion - namespace Spring.Web.UI; /// diff --git a/src/Spring/Spring.Web/Web/UI/MasterPage.cs b/src/Spring/Spring.Web/Web/UI/MasterPage.cs index 9e4cd4bb..22befab4 100644 --- a/src/Spring/Spring.Web/Web/UI/MasterPage.cs +++ b/src/Spring/Spring.Web/Web/UI/MasterPage.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Web.UI; using Spring.Collections; @@ -33,20 +27,14 @@ using System.Globalization; using System.Resources; using Spring.Web.Support; -#endregion Imports - namespace Spring.Web.UI; -#region ASP.NET 2.0 Spring Master Page Implementation - /// /// Spring.NET Master Page implementation for ASP.NET 2.0 /// /// Aleksandar Seovic public class MasterPage : System.Web.UI.MasterPage, IApplicationContextAware, ISupportsWebDependencyInjection, IWebNavigable { - #region Instance Fields - private ILocalizer localizer; private IValidationErrors validationErrors = new ValidationErrors(); private IMessageSource messageSource; @@ -55,10 +43,6 @@ public class MasterPage : System.Web.UI.MasterPage, IApplicationContextAware, IS private IWebNavigator webNavigator; private IDictionary args; - #endregion - - #region Lifecycle methods - /// /// Initialize a new MasterPage instance. /// @@ -148,10 +132,6 @@ public class MasterPage : System.Web.UI.MasterPage, IApplicationContextAware, IS return control; } - #endregion Control lifecycle methods - - #region Data binding events - /// /// This event is raised after all controls have been populated with values /// from the data model. @@ -188,10 +168,6 @@ public class MasterPage : System.Web.UI.MasterPage, IApplicationContextAware, IS } } - #endregion - - #region Application context support - /// /// Gets or sets the that this /// object runs in. @@ -227,10 +203,6 @@ public class MasterPage : System.Web.UI.MasterPage, IApplicationContextAware, IS set { applicationContext = value; } } - #endregion - - #region Message source and localization support - /// /// Gets or sets the localizer. /// @@ -354,10 +326,6 @@ public class MasterPage : System.Web.UI.MasterPage, IApplicationContextAware, IS set { Page.UserCulture = value; } } - #endregion - - #region Result support - /// /// Ensure, that is set to a valid instance. /// @@ -497,10 +465,6 @@ public class MasterPage : System.Web.UI.MasterPage, IApplicationContextAware, IS return ResolveUrl(WebNavigator.GetResultUri(resultName, this, context)); } - #endregion - - #region Validation support - /// /// Evaluates specified validators and returns True if all of them are valid. /// @@ -573,10 +537,6 @@ public class MasterPage : System.Web.UI.MasterPage, IApplicationContextAware, IS return parameters; } - #endregion - - #region Spring Page support - /// /// Overrides Page property to return /// instead of . @@ -588,10 +548,6 @@ public class MasterPage : System.Web.UI.MasterPage, IApplicationContextAware, IS get { return (Page) base.Page; } } - #endregion - - #region Dependency Injection Support - /// /// Holds the default ApplicationContext to be used during DI. /// @@ -609,8 +565,4 @@ public class MasterPage : System.Web.UI.MasterPage, IApplicationContextAware, IS control = WebDependencyInjectionUtils.InjectDependenciesRecursive(defaultApplicationContext, control); base.AddedControl(control, index); } - - #endregion Dependency Injection Support -} - -#endregion +} \ No newline at end of file diff --git a/src/Spring/Spring.Web/Web/UI/Page.cs b/src/Spring/Spring.Web/Web/UI/Page.cs index 6f628dae..5979ad13 100644 --- a/src/Spring/Spring.Web/Web/UI/Page.cs +++ b/src/Spring/Spring.Web/Web/UI/Page.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Collections.Specialized; using System.ComponentModel; @@ -40,14 +34,8 @@ using Spring.Validation; using Spring.Web.Support; using IValidator = Spring.Validation.IValidator; -#endregion - namespace Spring.Web.UI; -#region Result support - -#endregion - /// /// Represents an .aspx file, also known as a Web Forms page, requested from a /// server that hosts an ASP.NET Web application. @@ -73,18 +61,12 @@ namespace Spring.Web.UI; public class Page : System.Web.UI.Page, IHttpHandler, IApplicationContextAware, ISharedStateAware, ISupportsWebDependencyInjection, IWebDataBound, IValidationContainer, IWebNavigable { - #region Constants - private static readonly object EventInitializeControls = new object(); private static readonly object EventPreLoadViewState = new object(); private static readonly object EventDataBindingsInitialized = new object(); private static readonly object EventDataBound = new object(); private static readonly object EventDataUnbound = new object(); - #endregion - - #region Instance Fields - private object controller; private IDictionary sharedState; @@ -106,10 +88,6 @@ public class Page : System.Web.UI.Page, IHttpHandler, IApplicationContextAware, private string scriptsRoot = "Scripts"; private string imagesRoot = "Images"; - #endregion - - #region Page lifecycle methods - /// /// Creates and initializes the new page instance. /// @@ -421,10 +399,6 @@ public class Page : System.Web.UI.Page, IHttpHandler, IApplicationContextAware, return control; } - #endregion - - #region Model Management Support - private IModelPersistenceMedium modelPersistenceMedium = new SessionModelPersistenceMedium(); /// @@ -506,10 +480,6 @@ public class Page : System.Web.UI.Page, IHttpHandler, IApplicationContextAware, return null; } - #endregion - - #region Process and Controller support - /// /// Gets or sets controller for the page. /// @@ -566,10 +536,6 @@ public class Page : System.Web.UI.Page, IHttpHandler, IApplicationContextAware, return controller; } - #endregion - - #region Shared State support - /// /// Returns a thread-safe dictionary that contains state that is shared by /// all instances of this page. @@ -582,8 +548,6 @@ public class Page : System.Web.UI.Page, IHttpHandler, IApplicationContextAware, set { this.sharedState = value; } } - #endregion - /// /// Overrides the default PreviousPage property to return an instance of , /// and to work properly during server-side transfers and executes. @@ -606,8 +570,6 @@ public class Page : System.Web.UI.Page, IHttpHandler, IApplicationContextAware, } } - #region Master Page support - /// /// Gets the master page that determines the overall look of the page. /// @@ -628,10 +590,6 @@ public class Page : System.Web.UI.Page, IHttpHandler, IApplicationContextAware, get { return Master != null || MasterPageFile != null; } } - #endregion - - #region CSS support - /// /// Gets a dictionary of registered styles. /// @@ -694,10 +652,6 @@ public class Page : System.Web.UI.Page, IHttpHandler, IApplicationContextAware, return styleFiles.Contains(key); } - #endregion - - #region Client script support - /// /// Gets a dictionary of registered head scripts. /// @@ -786,10 +740,6 @@ public class Page : System.Web.UI.Page, IHttpHandler, IApplicationContextAware, return headScripts.Contains(key); } - #endregion - - #region Well-known folders support - /// /// Gets or sets the CSS root. /// @@ -826,10 +776,6 @@ public class Page : System.Web.UI.Page, IHttpHandler, IApplicationContextAware, set { imagesRoot = value; } } - #endregion - - #region Result support - /// /// Ensure, that is set to a valid instance. /// @@ -972,10 +918,6 @@ public class Page : System.Web.UI.Page, IHttpHandler, IApplicationContextAware, return ResolveUrl(WebNavigator.GetResultUri(resultName, this, context)); } - #endregion - - #region Validation support - /// ///Instructs any validation controls included on the page to validate their assigned information. /// @@ -1071,10 +1013,6 @@ public class Page : System.Web.UI.Page, IHttpHandler, IApplicationContextAware, return parameters; } - #endregion - - #region Data binding support - /// /// Initializes the data bindings. /// @@ -1261,10 +1199,6 @@ public class Page : System.Web.UI.Page, IHttpHandler, IApplicationContextAware, } } - #endregion - - #region Application context support - /// /// Gets or sets the that this /// object runs in. @@ -1300,10 +1234,6 @@ public class Page : System.Web.UI.Page, IHttpHandler, IApplicationContextAware, set { applicationContext = value; } } - #endregion - - #region Message source and localization support - /// /// Gets or sets the localizer. /// @@ -1483,10 +1413,6 @@ public class Page : System.Web.UI.Page, IHttpHandler, IApplicationContextAware, } } - #endregion - - #region Helper methods - /// /// Creates a key for shared state, taking into account whether /// this page belongs to a process or not. @@ -1498,10 +1424,6 @@ public class Page : System.Web.UI.Page, IHttpHandler, IApplicationContextAware, return key; } - #endregion - - #region Dependency Injection Support - /// /// Holds default ApplicationContext instance to be used during DI. /// @@ -1519,6 +1441,4 @@ public class Page : System.Web.UI.Page, IHttpHandler, IApplicationContextAware, control = WebDependencyInjectionUtils.InjectDependenciesRecursive(defaultApplicationContext, control); base.AddedControl(control, index); } - - #endregion Dependency Injection Support } \ No newline at end of file diff --git a/src/Spring/Spring.Web/Web/UI/SessionModelPersistenceMedium.cs b/src/Spring/Spring.Web/Web/UI/SessionModelPersistenceMedium.cs index ca801a5b..831b065f 100644 --- a/src/Spring/Spring.Web/Web/UI/SessionModelPersistenceMedium.cs +++ b/src/Spring/Spring.Web/Web/UI/SessionModelPersistenceMedium.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Web.SessionState; using System.Web.UI; -#endregion - namespace Spring.Web.UI; /// @@ -87,4 +79,4 @@ public class SessionModelPersistenceMedium : IModelPersistenceMedium { context.Page.Session[key] = item; } -} \ No newline at end of file +} diff --git a/src/Spring/Spring.Web/Web/UI/UserControl.cs b/src/Spring/Spring.Web/Web/UI/UserControl.cs index fc883d5a..0d06df91 100644 --- a/src/Spring/Spring.Web/Web/UI/UserControl.cs +++ b/src/Spring/Spring.Web/Web/UI/UserControl.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Collections.Specialized; using System.ComponentModel; @@ -37,8 +31,6 @@ using Spring.Validation; using Spring.Web.Support; using IValidator = Spring.Validation.IValidator; -#endregion - namespace Spring.Web.UI; /// @@ -48,17 +40,11 @@ namespace Spring.Web.UI; public class UserControl : System.Web.UI.UserControl, IApplicationContextAware, IWebDataBound, ISupportsWebDependencyInjection, IPostBackDataHandler, IValidationContainer, IWebNavigable { - #region Static fields - private static readonly object EventPreLoadViewState = new object(); private static readonly object EventDataBindingsInitialized = new object(); private static readonly object EventDataBound = new object(); private static readonly object EventDataUnbound = new object(); - #endregion - - #region Instance Fields - private object controller; private ILocalizer localizer; private IMessageSource messageSource; @@ -71,10 +57,6 @@ public class UserControl : System.Web.UI.UserControl, IApplicationContextAware, private IApplicationContext defaultApplicationContext; private bool needsUnbind = false; - #endregion - - #region Control lifecycle methods - /// /// Initialize a new UserControl instance. /// @@ -276,10 +258,6 @@ public class UserControl : System.Web.UI.UserControl, IApplicationContextAware, return control; } - #endregion - - #region Model Management Support - private IModelPersistenceMedium modelPersistenceMedium = new SessionModelPersistenceMedium(); /// @@ -361,10 +339,6 @@ public class UserControl : System.Web.UI.UserControl, IApplicationContextAware, return null; } - #endregion< - - #region Controller Support - /// /// Gets or sets controller for the control. /// @@ -424,10 +398,6 @@ public class UserControl : System.Web.UI.UserControl, IApplicationContextAware, return controller; } - #endregion Controller Support - - #region Shared State support - /// /// Returns a thread-safe dictionary that contains state that is shared by /// all instances of this control. @@ -466,10 +436,6 @@ public class UserControl : System.Web.UI.UserControl, IApplicationContextAware, } } - #endregion Shared State support - - #region Result support - /// /// Ensure, that is set to a valid instance. /// @@ -609,10 +575,6 @@ public class UserControl : System.Web.UI.UserControl, IApplicationContextAware, return ResolveUrl(WebNavigator.GetResultUri(resultName, this, context)); } - #endregion - - #region Validation support - /// /// Evaluates specified validators and returns True if all of them are valid. /// @@ -690,10 +652,6 @@ public class UserControl : System.Web.UI.UserControl, IApplicationContextAware, return parameters; } - #endregion - - #region Data binding support - /// /// Initializes the data bindings. /// @@ -887,10 +845,6 @@ public class UserControl : System.Web.UI.UserControl, IApplicationContextAware, } } - #endregion - - #region Application context support - /// /// Gets or sets the that this /// object runs in. @@ -926,10 +880,6 @@ public class UserControl : System.Web.UI.UserControl, IApplicationContextAware, set { applicationContext = value; } } - #endregion - - #region Message source and localization support - /// /// Gets or sets the localizer. /// @@ -1063,10 +1013,6 @@ public class UserControl : System.Web.UI.UserControl, IApplicationContextAware, set { Page.UserCulture = value; } } - #endregion - - #region Spring Page support - /// /// Overrides Page property to return /// instead of . @@ -1091,10 +1037,6 @@ public class UserControl : System.Web.UI.UserControl, IApplicationContextAware, } } - #endregion - - #region Helper Methods - /// /// Creates a key for shared state, taking into account whether /// this page belongs to a process or not. @@ -1106,10 +1048,6 @@ public class UserControl : System.Web.UI.UserControl, IApplicationContextAware, return key; } - #endregion - - #region Dependency Injection Support - /// /// Holds the default ApplicationContext to be used during DI. /// @@ -1127,6 +1065,4 @@ public class UserControl : System.Web.UI.UserControl, IApplicationContextAware, WebDependencyInjectionUtils.InjectDependenciesRecursive(defaultApplicationContext, control); base.AddedControl(control, index); } - - #endregion Dependency Injection Support } diff --git a/src/Spring/Spring.Web/Web/UI/Validation/AbstractValidationErrorsRenderer.cs b/src/Spring/Spring.Web/Web/UI/Validation/AbstractValidationErrorsRenderer.cs index 39c007ec..a38b43f4 100644 --- a/src/Spring/Spring.Web/Web/UI/Validation/AbstractValidationErrorsRenderer.cs +++ b/src/Spring/Spring.Web/Web/UI/Validation/AbstractValidationErrorsRenderer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Web.UI; namespace Spring.Web.UI.Validation; diff --git a/src/Spring/Spring.Web/Web/UI/Validation/DivValidationErrorsRenderer.cs b/src/Spring/Spring.Web/Web/UI/Validation/DivValidationErrorsRenderer.cs index 168901ca..cc04cf16 100644 --- a/src/Spring/Spring.Web/Web/UI/Validation/DivValidationErrorsRenderer.cs +++ b/src/Spring/Spring.Web/Web/UI/Validation/DivValidationErrorsRenderer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Web.UI; namespace Spring.Web.UI.Validation; diff --git a/src/Spring/Spring.Web/Web/UI/Validation/IValidationErrorsRenderer.cs b/src/Spring/Spring.Web/Web/UI/Validation/IValidationErrorsRenderer.cs index d4973c09..8e7a1513 100644 --- a/src/Spring/Spring.Web/Web/UI/Validation/IValidationErrorsRenderer.cs +++ b/src/Spring/Spring.Web/Web/UI/Validation/IValidationErrorsRenderer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Web.UI; using Spring.Web.UI.Controls; diff --git a/src/Spring/Spring.Web/Web/UI/Validation/IconValidationErrorsRenderer.cs b/src/Spring/Spring.Web/Web/UI/Validation/IconValidationErrorsRenderer.cs index 1e51b7f9..17687745 100644 --- a/src/Spring/Spring.Web/Web/UI/Validation/IconValidationErrorsRenderer.cs +++ b/src/Spring/Spring.Web/Web/UI/Validation/IconValidationErrorsRenderer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Text; using System.Web.UI; diff --git a/src/Spring/Spring.Web/Web/UI/Validation/SpanValidationErrorsRenderer.cs b/src/Spring/Spring.Web/Web/UI/Validation/SpanValidationErrorsRenderer.cs index 863d6326..bda047f4 100644 --- a/src/Spring/Spring.Web/Web/UI/Validation/SpanValidationErrorsRenderer.cs +++ b/src/Spring/Spring.Web/Web/UI/Validation/SpanValidationErrorsRenderer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Web.UI; using Spring.Web.UI.Controls; diff --git a/test/Spring/Spring.Aop.Tests/Aop/Advice/DebugAdvice.cs b/test/Spring/Spring.Aop.Tests/Aop/Advice/DebugAdvice.cs index 5ea8ee4d..14c553ac 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Advice/DebugAdvice.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Advice/DebugAdvice.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using AopAlliance.Intercept; namespace Spring.Aop.Advice; diff --git a/test/Spring/Spring.Aop.Tests/Aop/Config/AopNamespaceParserTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Config/AopNamespaceParserTests.cs index add89860..80454c76 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Config/AopNamespaceParserTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Config/AopNamespaceParserTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Aop.Framework; using Spring.Context; diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/AbstractMethodInvocationTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/AbstractMethodInvocationTests.cs index cbf2d574..5da2b918 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/AbstractMethodInvocationTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/AbstractMethodInvocationTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Globalization; using System.Reflection; diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/AdvisorAdapterRegistrationTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/AdvisorAdapterRegistrationTests.cs index 0a6f0d55..a6dc8693 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/AdvisorAdapterRegistrationTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/AdvisorAdapterRegistrationTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Context; using Spring.Context.Support; diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/AfterReturningAdviceInterceptorTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/AfterReturningAdviceInterceptorTests.cs index e65fb11d..1270db53 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/AfterReturningAdviceInterceptorTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/AfterReturningAdviceInterceptorTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using AopAlliance.Intercept; using FakeItEasy; using NUnit.Framework; diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/ThrowsAdviceInterceptorTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/ThrowsAdviceInterceptorTests.cs index 485b1bb4..55f67d3a 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/ThrowsAdviceInterceptorTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/ThrowsAdviceInterceptorTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using System.Runtime.Remoting; using System.Web; diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/UnknownAdviceTypeExceptionTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/UnknownAdviceTypeExceptionTests.cs index 3526e236..0b17d5f3 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/UnknownAdviceTypeExceptionTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/UnknownAdviceTypeExceptionTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; namespace Spring.Aop.Framework.Adapter; diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/AopContextTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/AopContextTests.cs index f639ce15..eece6fb9 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/AopContextTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/AopContextTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using AopAlliance.Aop; using NUnit.Framework; using AopAlliance.Intercept; using Spring.Threading; -#endregion - namespace Spring.Aop.Framework; /// @@ -88,8 +80,6 @@ public sealed class AopContextTests Assert.IsFalse(AopContext.IsActive); } - #region CurrentProxyIsThreadSafe - [Test, Explicit] public void ProxyPerformanceTests() { @@ -244,6 +234,4 @@ public sealed class AopContextTests return ret; } } - - #endregion } diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AbstractAdvisorAutoProxyCreatorTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AbstractAdvisorAutoProxyCreatorTests.cs index 7c2e7a25..4a338f70 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AbstractAdvisorAutoProxyCreatorTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AbstractAdvisorAutoProxyCreatorTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using AopAlliance.Aop; using NUnit.Framework; @@ -52,8 +48,6 @@ public class AbstractAdvisorAutoProxyCreatorTests { public string Name; - #region Implementation of IAdvisor - public bool IsPerInstance { get { throw new NotImplementedException(); } @@ -63,8 +57,6 @@ public class AbstractAdvisorAutoProxyCreatorTests { get { throw new NotImplementedException(); } } - - #endregion } [Test] diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AbstractAutoProxyCreatorTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AbstractAutoProxyCreatorTests.cs index c65606ed..f8afedb7 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AbstractAutoProxyCreatorTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AbstractAutoProxyCreatorTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Remoting; using System.Runtime.Remoting.Messaging; using System.Runtime.Remoting.Proxies; diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AdvisorAutoProxyCreatorCircularReferencesTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AdvisorAutoProxyCreatorCircularReferencesTests.cs index efd6151f..fadc3751 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AdvisorAutoProxyCreatorCircularReferencesTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AdvisorAutoProxyCreatorCircularReferencesTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using Microsoft.Extensions.Logging; using NUnit.Framework; @@ -29,8 +23,6 @@ using Spring.Objects; using Spring.Objects.Factory; using Spring.Objects.Factory.Xml; -#endregion - namespace Spring.Aop.Framework.AutoProxy; /// @@ -76,8 +68,6 @@ public class AdvisorAutoProxyCreatorCircularReferencesTests } } -#region Support Classes - public class TestDefaultAdvisorAutoProxyCreator : DefaultAdvisorAutoProxyCreator, IInitializingObject { private readonly ILog _logger; @@ -219,6 +209,4 @@ public class TestObjectFactoryObject : IFactoryObject, IInitializingObject testObject = new TestObject(); initialized = true; } -} - -#endregion \ No newline at end of file +} \ No newline at end of file diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AdvisorAutoProxyCreatorTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AdvisorAutoProxyCreatorTests.cs index 59e67ab9..465229bf 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AdvisorAutoProxyCreatorTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AdvisorAutoProxyCreatorTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Context.Support; using Spring.Objects; @@ -27,8 +21,6 @@ using Spring.Objects.Factory; using Spring.Objects.Factory.Xml; using Spring.Threading; -#endregion#region License - namespace Spring.Aop.Framework.AutoProxy; /// diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AttributeAutoProxyCreatorTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AttributeAutoProxyCreatorTests.cs index b2e301cd..e3cbaacd 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AttributeAutoProxyCreatorTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AttributeAutoProxyCreatorTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Objects; -#endregion - namespace Spring.Aop.Framework.AutoProxy; /// diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/CreatesTestObject.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/CreatesTestObject.cs index 11beb40e..def3f46e 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/CreatesTestObject.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/CreatesTestObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects; using Spring.Objects.Factory; diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/InfrastructureAdvisorAutoProxyCreator.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/InfrastructureAdvisorAutoProxyCreator.cs index ec2f5eb5..dea6e0dd 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/InfrastructureAdvisorAutoProxyCreator.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/InfrastructureAdvisorAutoProxyCreator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using AopAlliance.Aop; using NUnit.Framework; using Spring.Objects.Factory.Config; @@ -43,8 +39,6 @@ public class InfrastructureAdvisorAutoProxyCreatorTests { public string Name; - #region Implementation of IAdvisor - public bool IsPerInstance { get { throw new NotImplementedException(); } @@ -54,8 +48,6 @@ public class InfrastructureAdvisorAutoProxyCreatorTests { get { throw new NotImplementedException(); } } - - #endregion } [Test] diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/LogicalThreadContextAdvice.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/LogicalThreadContextAdvice.cs index 460b0231..fcb9a0c2 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/LogicalThreadContextAdvice.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/LogicalThreadContextAdvice.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using Spring.Threading; -#endregion - namespace Spring.Aop.Framework.AutoProxy; public class LogicalThreadContextAdvice : IMethodBeforeAdvice diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/NoSetterProperties.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/NoSetterProperties.cs index beac63e8..068c75c6 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/NoSetterProperties.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/NoSetterProperties.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Text; namespace Spring.Aop.Framework.AutoProxy; diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/ObjectNameAutoProxyCreatorTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/ObjectNameAutoProxyCreatorTests.cs index 3249ffeb..b8746df2 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/ObjectNameAutoProxyCreatorTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/ObjectNameAutoProxyCreatorTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Aop.Interceptor; using Spring.Context; @@ -27,8 +21,6 @@ using Spring.Context.Support; using Spring.Objects; using Spring.Objects.Factory.Xml; -#endregion#region License - namespace Spring.Aop.Framework.AutoProxy; /// diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/OrderedLogicalThreadContextCheckAdvisor.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/OrderedLogicalThreadContextCheckAdvisor.cs index 2a560374..0f52120c 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/OrderedLogicalThreadContextCheckAdvisor.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/OrderedLogicalThreadContextCheckAdvisor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using Spring.Aop.Support; using Spring.Objects.Factory; using Spring.Threading; -#endregion - namespace Spring.Aop.Framework.AutoProxy; /// diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/PointcutFilteringAutoProxyCreatorTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/PointcutFilteringAutoProxyCreatorTests.cs index 45cf924d..8c892d5e 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/PointcutFilteringAutoProxyCreatorTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/PointcutFilteringAutoProxyCreatorTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Aop.Support; using Spring.Objects; -#endregion - namespace Spring.Aop.Framework.AutoProxy; /// diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/TypeNameAutoProxyCreatorTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/TypeNameAutoProxyCreatorTests.cs index 2bdb435c..520b0468 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/TypeNameAutoProxyCreatorTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/TypeNameAutoProxyCreatorTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Objects; -#endregion - namespace Spring.Aop.Framework.AutoProxy; /// diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingAfterReturningAdvice.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingAfterReturningAdvice.cs index 5770f774..a3a276e7 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingAfterReturningAdvice.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingAfterReturningAdvice.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; -#endregion - namespace Spring.Aop.Framework; /// diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingBeforeAdvice.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingBeforeAdvice.cs index de48c2ed..ef41af16 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingBeforeAdvice.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingBeforeAdvice.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; -#endregion - namespace Spring.Aop.Framework; /// diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingMultiAdvice.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingMultiAdvice.cs index 74074123..35c221eb 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingMultiAdvice.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingMultiAdvice.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; -#endregion - namespace Spring.Aop.Framework; /// diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingThrowsAdvice.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingThrowsAdvice.cs index 7f45d6f4..cce494aa 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingThrowsAdvice.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingThrowsAdvice.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Aop.Framework; /// diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicMethodInvocationTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicMethodInvocationTests.cs index feefa37d..cc549b83 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicMethodInvocationTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicMethodInvocationTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using System.Collections; using NUnit.Framework; -#endregion - namespace Spring.Aop.Framework; /// diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/AopUtilsTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/AopUtilsTests.cs index c94f8988..cf42f830 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/AopUtilsTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/AopUtilsTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Reflection; using FakeItEasy; @@ -169,8 +165,6 @@ public sealed class AopUtilsTests Assert.IsTrue(AopUtils.CanApply(mockIntroAdvisor, typeof(TestObject), null)); } - #region Helper Classes - private sealed class OneMethodTestPointcut : StaticMethodMatcherPointcut { public override bool Matches(MethodInfo m, Type targetClass) @@ -223,6 +217,4 @@ public sealed class AopUtilsTests throw new NotImplementedException(); } } - - #endregion } diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/CachedAopProxyFactoryTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/CachedAopProxyFactoryTests.cs index af941d75..4ebc301b 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/CachedAopProxyFactoryTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/CachedAopProxyFactoryTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Objects; using Spring.Aop.Support; -#endregion - namespace Spring.Aop.Framework.DynamicProxy; /// @@ -144,8 +136,6 @@ public sealed class CachedAopProxyFactoryTests : DefaultAopProxyFactoryTests Assert.AreEqual(count, CachedAopProxyFactory.CountCachedTypes); } - #region Helper classes definitions - public interface ICommand { void Execute(); @@ -165,6 +155,4 @@ public sealed class CachedAopProxyFactoryTests : DefaultAopProxyFactoryTests { } } - - #endregion } diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/CompositionAopProxyTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/CompositionAopProxyTests.cs index 4fa3d0c5..ff5b5d5f 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/CompositionAopProxyTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/CompositionAopProxyTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Objects; -#endregion - namespace Spring.Aop.Framework.DynamicProxy; /// @@ -71,8 +63,6 @@ public class CompositionAopProxyTests : AbstractAopProxyTests Assert.IsFalse(proxy is TestObject); } - #region ReturnsThisWhenProxyIsIncompatible - [Test] public void ReturnsThisWhenProxyIsIncompatible() { @@ -112,6 +102,4 @@ public class CompositionAopProxyTests : AbstractAopProxyTests return this; } } - - #endregion } \ No newline at end of file diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/DecoratorAopProxyTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/DecoratorAopProxyTests.cs index c8bc38cd..ca638f1a 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/DecoratorAopProxyTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/DecoratorAopProxyTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; using Spring.Aop.Interceptor; using Spring.Objects; -#endregion - namespace Spring.Aop.Framework.DynamicProxy; /// @@ -242,8 +234,6 @@ public class DecoratorAopProxyTests : AbstractAopProxyTests base.ProxyGenericMethodWithRefOutParametersWithStandardReflection(); } - #region Attributes - [Test] public void ProxyTargetVirtualMethodAttributes() { @@ -370,10 +360,6 @@ public class DecoratorAopProxyTests : AbstractAopProxyTests Assert.AreEqual(0, attrs.Length, "Should not have attribute applied to the method's return value."); } - #endregion - - #region Helper classes definitions - internal class NonPublicTestObject { } @@ -418,6 +404,4 @@ public class DecoratorAopProxyTests : AbstractAopProxyTests public class DerivedDoesNotImplementInterfaceTestObject : DoesNotImplementInterfaceTestObject { } - - #endregion } diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/DefaultAopProxyFactoryTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/DefaultAopProxyFactoryTests.cs index 6377141b..2c85643e 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/DefaultAopProxyFactoryTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/DefaultAopProxyFactoryTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Objects; -#endregion - namespace Spring.Aop.Framework.DynamicProxy; /// @@ -90,14 +82,10 @@ public class DefaultAopProxyFactoryTests Assert.IsTrue(AopUtils.IsDecoratorAopProxy(aopProxy)); } - #region Helper classes definitions - public class DoesNotImplementAnyInterfacesTestObject { public virtual void SomeMethod() { } } - - #endregion } diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/InheritanceAopProxyTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/InheritanceAopProxyTests.cs index c73595b3..109755c3 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/InheritanceAopProxyTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/InheritanceAopProxyTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Objects; using Spring.Aop.Interceptor; using System.Reflection; using Spring.Expressions; -#endregion - namespace Spring.Aop.Framework.DynamicProxy; /// @@ -341,8 +333,6 @@ public class InheritanceAopProxyTests } } -#region Helper Classes - public interface IIncrementable { int Value { get; set; } @@ -375,8 +365,6 @@ public class InheritanceTestObject : IIncrementable this._value = value; } - #region IIncrementable Members - // non virtual method that belongs to an interface private int _value; @@ -393,8 +381,6 @@ public class InheritanceTestObject : IIncrementable this._value++; } - #endregion - // final method public void Reset() { @@ -432,6 +418,4 @@ public class InheritanceTestObject : IIncrementable public class DerivedInheritanceTestObject : InheritanceTestObject { -} - -#endregion +} \ No newline at end of file diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/MockTargetSource.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/MockTargetSource.cs index 31c8b036..2a622bea 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/MockTargetSource.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/MockTargetSource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Aop.Framework.DynamicProxy; /// @@ -54,8 +46,6 @@ public class MockTargetSource : ITargetSource throw new Exception("Expectation failed: " + gets + " gets and " + releases + " releases"); } - #region ITargetSource Members - public Type TargetType { get { return _target.GetType(); } @@ -78,6 +68,4 @@ public class MockTargetSource : ITargetSource throw new Exception("Released wrong target"); ++releases; } - - #endregion } diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/HashtableCachingAdvisorChainFactoryTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/HashtableCachingAdvisorChainFactoryTests.cs index 783f055d..a4190014 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/HashtableCachingAdvisorChainFactoryTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/HashtableCachingAdvisorChainFactoryTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Aop.Framework; /// @@ -33,8 +25,6 @@ namespace Spring.Aop.Framework; [TestFixture] public sealed class HashtableCachingAdvisorChainFactoryTests { - #region SetUp - /// /// The setup logic executed before the execution of this test fixture. /// @@ -51,10 +41,6 @@ public sealed class HashtableCachingAdvisorChainFactoryTests { } - #endregion - - #region TearDown - /// /// The tear down logic executed after the execution of each individual test. /// @@ -71,8 +57,6 @@ public sealed class HashtableCachingAdvisorChainFactoryTests { } - #endregion - [Test] public void Instantiation() { diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/IIsModified.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/IIsModified.cs index 8ab72327..2a9efa15 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/IIsModified.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/IIsModified.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Aop.Framework; public interface IIsModified diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/ITimeStamped.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/ITimeStamped.cs index 7f3e17dd..b3f31638 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/ITimeStamped.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/ITimeStamped.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Aop.Framework; /// diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/IsModifiedMixin.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/IsModifiedMixin.cs index 8dd3ba80..92ec7478 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/IsModifiedMixin.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/IsModifiedMixin.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using AopAlliance.Aop; using Spring.Aop.Support; diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/MethodCounter.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/MethodCounter.cs index 9ed0b334..0be831c7 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/MethodCounter.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/MethodCounter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Reflection; -#endregion - namespace Spring.Aop.Framework; /// diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/PrototypeTargetTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/PrototypeTargetTests.cs index c25aa2a8..a72ea1b5 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/PrototypeTargetTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/PrototypeTargetTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Objects.Factory; using Spring.Objects.Factory.Xml; using AopAlliance.Intercept; using NUnit.Framework; -#endregion - namespace Spring.Aop.Framework; /// diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyConfigTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyConfigTests.cs index b5d16a4e..db375a38 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyConfigTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyConfigTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Diagnostics; using NUnit.Framework; -#endregion - namespace Spring.Aop.Framework; /// diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyFactoryObjectTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyFactoryObjectTests.cs index 13230c98..eb15de7f 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyFactoryObjectTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyFactoryObjectTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Reflection; using System.Text; @@ -887,8 +883,6 @@ public sealed class ProxyFactoryObjectTests Assert.AreNotSame(testObjectType1, testObjectType2); } - #region WorkerThread Class - public class WorkerThread { private Exception _exception; @@ -936,10 +930,6 @@ public sealed class ProxyFactoryObjectTests } } - #endregion WorkerThread Class - - #region Helper Classes - public interface ICommand { void Execute(); @@ -1042,12 +1032,8 @@ public sealed class ProxyFactoryObjectTests throw ex; } } - - #endregion } -#region HelpersForNotAccessibleInterfaceProxyingTest - public class HelperClassForNotAccessibleInterfaceProxyingTest : HelperInterface1, HelperInterface2 { public string FirstDoSomething() @@ -1069,6 +1055,4 @@ internal interface HelperInterface1 public interface HelperInterface2 { string SecondDoSomething(); -} - -#endregion +} \ No newline at end of file diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyFactoryTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyFactoryTests.cs index bc47de0e..aa27f2eb 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyFactoryTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyFactoryTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using AopAlliance.Aop; using AopAlliance.Intercept; diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/ReflectiveMethodInvocationTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/ReflectiveMethodInvocationTests.cs index 06677ce0..fcdb9541 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/ReflectiveMethodInvocationTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/ReflectiveMethodInvocationTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using System.Collections; using NUnit.Framework; -#endregion - namespace Spring.Aop.Framework; /// diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/TimestampIntroductionInterceptor.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/TimestampIntroductionInterceptor.cs index 79054dc8..44139e21 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/TimestampIntroductionInterceptor.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/TimestampIntroductionInterceptor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using AopAlliance.Aop; using AopAlliance.Intercept; -#endregion - namespace Spring.Aop.Framework; /// @@ -50,8 +42,6 @@ public class TimestampIntroductionInterceptor : IAdvice, ITimeStamped, IIntercep this.ts = ts; } - #region ITimeStamped Members - public DateTime TimeStamp { get @@ -63,6 +53,4 @@ public class TimestampIntroductionInterceptor : IAdvice, ITimeStamped, IIntercep this.ts = value; } } - - #endregion } diff --git a/test/Spring/Spring.Aop.Tests/Aop/ISimpleBeforeAdvice.cs b/test/Spring/Spring.Aop.Tests/Aop/ISimpleBeforeAdvice.cs index 8809dc32..c746a307 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/ISimpleBeforeAdvice.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/ISimpleBeforeAdvice.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Aop; /// diff --git a/test/Spring/Spring.Aop.Tests/Aop/Interceptor/NopInterceptor.cs b/test/Spring/Spring.Aop.Tests/Aop/Interceptor/NopInterceptor.cs index 18fcb0c2..43844b9b 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Interceptor/NopInterceptor.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Interceptor/NopInterceptor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; -#endregion - namespace Spring.Aop.Interceptor; /// diff --git a/test/Spring/Spring.Aop.Tests/Aop/Interceptor/SerializableNopInterceptor.cs b/test/Spring/Spring.Aop.Tests/Aop/Interceptor/SerializableNopInterceptor.cs index d28e6573..f40227eb 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Interceptor/SerializableNopInterceptor.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Interceptor/SerializableNopInterceptor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Runtime.Serialization; -#endregion - namespace Spring.Aop.Interceptor; /// diff --git a/test/Spring/Spring.Aop.Tests/Aop/SimpleBeforeAdviceAdapter.cs b/test/Spring/Spring.Aop.Tests/Aop/SimpleBeforeAdviceAdapter.cs index e2bc3e29..4c237254 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/SimpleBeforeAdviceAdapter.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/SimpleBeforeAdviceAdapter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using AopAlliance.Aop; using AopAlliance.Intercept; using Spring.Aop.Framework.Adapter; -#endregion - namespace Spring.Aop; /// @@ -36,8 +28,6 @@ namespace Spring.Aop; [Serializable] public class SimpleBeforeAdviceAdapter : IAdvisorAdapter { - #region IAdvisorAdapter Members - public bool SupportsAdvice(IAdvice advice) { return advice is ISimpleBeforeAdvice; @@ -48,6 +38,4 @@ public class SimpleBeforeAdviceAdapter : IAdvisorAdapter ISimpleBeforeAdvice advice = (ISimpleBeforeAdvice) advisor.Advice; return new SimpleBeforeAdviceInterceptor(advice); } - - #endregion } diff --git a/test/Spring/Spring.Aop.Tests/Aop/SimpleBeforeAdviceImpl.cs b/test/Spring/Spring.Aop.Tests/Aop/SimpleBeforeAdviceImpl.cs index bb114abd..9c5b0604 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/SimpleBeforeAdviceImpl.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/SimpleBeforeAdviceImpl.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Aop; /// @@ -33,8 +25,6 @@ public class SimpleBeforeAdviceImpl : ISimpleBeforeAdvice { private int _invocationCounter; - #region Properties - public int InvocationCounter { get @@ -43,22 +33,12 @@ public class SimpleBeforeAdviceImpl : ISimpleBeforeAdvice } } - #endregion - - #region Constructors - public SimpleBeforeAdviceImpl() { } - #endregion - - #region ISimpleBeforeAdvice Members - public void Before() { ++_invocationCounter; } - - #endregion } diff --git a/test/Spring/Spring.Aop.Tests/Aop/SimpleBeforeAdviceInterceptor.cs b/test/Spring/Spring.Aop.Tests/Aop/SimpleBeforeAdviceInterceptor.cs index c8154acb..4e85509d 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/SimpleBeforeAdviceInterceptor.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/SimpleBeforeAdviceInterceptor.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using AopAlliance.Intercept; -#endregion - namespace Spring.Aop; /// @@ -35,22 +27,14 @@ public class SimpleBeforeAdviceInterceptor : IMethodInterceptor { private ISimpleBeforeAdvice _advice; - #region Constructors - public SimpleBeforeAdviceInterceptor(ISimpleBeforeAdvice advice) { this._advice = advice; } - #endregion - - #region IMethodInterceptor Members - public object Invoke(IMethodInvocation mi) { _advice.Before(); return mi.Proceed(); } - - #endregion } diff --git a/test/Spring/Spring.Aop.Tests/Aop/Support/AbstractRegularExpressionMethodPointcutTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Support/AbstractRegularExpressionMethodPointcutTests.cs index db61bfe9..eed58b5c 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Support/AbstractRegularExpressionMethodPointcutTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Support/AbstractRegularExpressionMethodPointcutTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using Spring.Util; using NUnit.Framework; -#endregion - namespace Spring.Aop.Support; /// diff --git a/test/Spring/Spring.Aop.Tests/Aop/Support/AttributeMatchMethodPointcutTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Support/AttributeMatchMethodPointcutTests.cs index 0c9dd1ce..9982257b 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Support/AttributeMatchMethodPointcutTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Support/AttributeMatchMethodPointcutTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using System.Reflection; -#endregion - namespace Spring.Aop.Support; /// @@ -195,8 +187,6 @@ public sealed class AttributeMatchMethodPointcutTests } } - #region Helper classes definitions - [AttributeUsage(AttributeTargets.Method)] private sealed class MarkupAttribute : Attribute { @@ -255,6 +245,4 @@ public sealed class AttributeMatchMethodPointcutTests public void TestMethod(string param) { } } - - #endregion } diff --git a/test/Spring/Spring.Aop.Tests/Aop/Support/ControlFlowPointcutTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Support/ControlFlowPointcutTests.cs index 045e2d3e..b64cf9ac 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Support/ControlFlowPointcutTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Support/ControlFlowPointcutTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using System.Runtime.CompilerServices; using NUnit.Framework; @@ -27,8 +21,6 @@ using Spring.Aop.Framework; using Spring.Aop.Interceptor; using Spring.Objects; -#endregion - namespace Spring.Aop.Support; /// @@ -207,8 +199,6 @@ public sealed class ControlFlowPointcutTests "Must not match - under cflow of Type specified in ctor, but no match on method name."); } - #region Helper Classes - /// /// Pointcut to catch all methods beginning with 'Set'. /// @@ -221,6 +211,4 @@ public sealed class ControlFlowPointcutTests return methodBase.Name.StartsWith("Set"); } } - - #endregion } diff --git a/test/Spring/Spring.Aop.Tests/Aop/Support/DefaultIntroductionAdvisorTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Support/DefaultIntroductionAdvisorTests.cs index 9ea774e2..020547dd 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Support/DefaultIntroductionAdvisorTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Support/DefaultIntroductionAdvisorTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using AopAlliance.Aop; using NUnit.Framework; diff --git a/test/Spring/Spring.Aop.Tests/Aop/Support/DelegatingIntroductionInterceptorTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Support/DelegatingIntroductionInterceptorTests.cs index a4651342..94e34ae8 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Support/DelegatingIntroductionInterceptorTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Support/DelegatingIntroductionInterceptorTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using AopAlliance.Aop; using FakeItEasy; diff --git a/test/Spring/Spring.Aop.Tests/Aop/Support/RegularExpressionMethodPointcutAdvisorTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Support/RegularExpressionMethodPointcutAdvisorTests.cs index 368e5676..6f704ecc 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Support/RegularExpressionMethodPointcutAdvisorTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Support/RegularExpressionMethodPointcutAdvisorTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Aop.Framework; using Spring.Aop.Interceptor; using Spring.Objects; @@ -28,8 +22,6 @@ using Spring.Objects.Factory.Xml; using Spring.Util; using NUnit.Framework; -#endregion - namespace Spring.Aop.Support; /// diff --git a/test/Spring/Spring.Aop.Tests/Aop/Support/RootTypeFilterTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Support/RootTypeFilterTests.cs index 4b4686e4..27eb3b66 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Support/RootTypeFilterTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Support/RootTypeFilterTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Aop.Support; /// diff --git a/test/Spring/Spring.Aop.Tests/Aop/Support/SdkRegularExpressionMethodPointcutTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Support/SdkRegularExpressionMethodPointcutTests.cs index 758a5a2f..411b988f 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Support/SdkRegularExpressionMethodPointcutTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Support/SdkRegularExpressionMethodPointcutTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Text.RegularExpressions; using Microsoft.Extensions.Logging.Abstractions; using NUnit.Framework; using Spring.Util; -#endregion - namespace Spring.Aop.Support; /// diff --git a/test/Spring/Spring.Aop.Tests/Aop/Support/TypeFiltersTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Support/TypeFiltersTests.cs index b0a1f7d7..38aae1e6 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Support/TypeFiltersTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Support/TypeFiltersTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Objects; -#endregion - namespace Spring.Aop.Support; /// diff --git a/test/Spring/Spring.Aop.Tests/Aop/Target/EmptyTargetSourceTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Target/EmptyTargetSourceTests.cs index 355eb27d..fb450909 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Target/EmptyTargetSourceTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Target/EmptyTargetSourceTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Util; -#endregion - namespace Spring.Aop.Target; /// diff --git a/test/Spring/Spring.Aop.Tests/Aop/Target/HotSwappableTargetSourceTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Target/HotSwappableTargetSourceTests.cs index b9afb113..acc249e5 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Target/HotSwappableTargetSourceTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Target/HotSwappableTargetSourceTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Objects.Factory; using Spring.Objects.Factory.Xml; -#endregion - namespace Spring.Aop.Target; /// diff --git a/test/Spring/Spring.Aop.Tests/Aop/Target/PrototypeTargetSourceTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Target/PrototypeTargetSourceTests.cs index eada6d76..fc512f4f 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Target/PrototypeTargetSourceTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Target/PrototypeTargetSourceTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using FakeItEasy; using Microsoft.Extensions.Logging.Abstractions; using NUnit.Framework; diff --git a/test/Spring/Spring.Aop.Tests/Aop/Target/SingletonTargetSourceTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Target/SingletonTargetSourceTests.cs index 418f6501..61c16ebd 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Target/SingletonTargetSourceTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Target/SingletonTargetSourceTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Aop.Target; /// diff --git a/test/Spring/Spring.Aop.Tests/Aop/Target/ThreadLocalTargetSourceTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Target/ThreadLocalTargetSourceTests.cs index 4cee799a..cdc3c459 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Target/ThreadLocalTargetSourceTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Target/ThreadLocalTargetSourceTests.cs @@ -195,8 +195,6 @@ public class ThreadLocalTargetSourceTests // name, ((IMultiThreadInterface)mtObject).Name)); } - #region Helper classes - public interface IMultiThreadInterface { string Name { get; } @@ -221,6 +219,4 @@ public class ThreadLocalTargetSourceTests return generated; } } - - #endregion } diff --git a/test/Spring/Spring.Aop.Tests/Aop/TrueMethodMatcherTests.cs b/test/Spring/Spring.Aop.Tests/Aop/TrueMethodMatcherTests.cs index 6f3d6463..2a9e44a5 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/TrueMethodMatcherTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/TrueMethodMatcherTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; using Spring.Util; -#endregion - namespace Spring.Aop; /// diff --git a/test/Spring/Spring.Aop.Tests/Aop/TruePointcutTests.cs b/test/Spring/Spring.Aop.Tests/Aop/TruePointcutTests.cs index cbb15cde..67e0a587 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/TruePointcutTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/TruePointcutTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Util; -#endregion - namespace Spring.Aop; /// diff --git a/test/Spring/Spring.Aop.Tests/Aop/TrueTypeFilterTests.cs b/test/Spring/Spring.Aop.Tests/Aop/TrueTypeFilterTests.cs index fc2f95ef..09df4d27 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/TrueTypeFilterTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/TrueTypeFilterTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Util; -#endregion - namespace Spring.Aop; /// diff --git a/test/Spring/Spring.Aop.Tests/AopCompilerOptionsTests.cs b/test/Spring/Spring.Aop.Tests/AopCompilerOptionsTests.cs index f03904c1..c84bbf66 100644 --- a/test/Spring/Spring.Aop.Tests/AopCompilerOptionsTests.cs +++ b/test/Spring/Spring.Aop.Tests/AopCompilerOptionsTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004-2009 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; using Spring.Aop; -#endregion - namespace Spring; /// Test that the AOP assembly is built with the correct DebugAttributes in release and debug builds. diff --git a/test/Spring/Spring.Aop.Tests/AopExceptionTests.cs b/test/Spring/Spring.Aop.Tests/AopExceptionTests.cs index f2a0b365..ce75fda3 100644 --- a/test/Spring/Spring.Aop.Tests/AopExceptionTests.cs +++ b/test/Spring/Spring.Aop.Tests/AopExceptionTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; -#endregion - namespace Spring; /// diff --git a/test/Spring/Spring.Aop.Tests/AopSerializationTests.cs b/test/Spring/Spring.Aop.Tests/AopSerializationTests.cs index bfb9daa2..a8875033 100644 --- a/test/Spring/Spring.Aop.Tests/AopSerializationTests.cs +++ b/test/Spring/Spring.Aop.Tests/AopSerializationTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Reflection; using System.Runtime.Serialization; diff --git a/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheAspectIntegrationTests.cs b/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheAspectIntegrationTests.cs index 921b22f3..0c2ff15b 100644 --- a/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheAspectIntegrationTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheAspectIntegrationTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Collections.Specialized; using NUnit.Framework; @@ -28,8 +22,6 @@ using Spring.Caching; using Spring.Context.Support; using Spring.Objects.Factory; -#endregion - namespace Spring.Aspects.Cache; /// @@ -162,8 +154,6 @@ public sealed class CacheAspectIntegrationTests } } -#region Inner Class : CacheParameterTarget - public interface IInventorStore { IList GetAll(); @@ -232,6 +222,4 @@ public sealed class GenericDao : IGenericDao { return default(T); } -} - -#endregion +} \ No newline at end of file diff --git a/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheParameterAdviceTests.cs b/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheParameterAdviceTests.cs index 11cbd9c7..45ca5052 100644 --- a/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheParameterAdviceTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheParameterAdviceTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using FakeItEasy; using NUnit.Framework; diff --git a/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheResultAdviceTests.cs b/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheResultAdviceTests.cs index e0044d48..ebe2a79e 100644 --- a/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheResultAdviceTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheResultAdviceTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Reflection; using System.Runtime.Serialization.Formatters.Binary; @@ -411,8 +407,6 @@ public sealed class CacheResultAdviceTests } } -#region Inner Class : CacheResultTarget - public delegate void VoidMethod(); public delegate int IntMethod(); @@ -539,8 +533,6 @@ public sealed class CacheResultTarget : ICacheResultTarget } } -#endregion - class BinaryFormatterCache : NonExpiringCache { protected override void DoInsert(object key, object value, System.TimeSpan timeToLive) diff --git a/test/Spring/Spring.Aop.Tests/Aspects/Cache/InvalidateCacheAdviceTests.cs b/test/Spring/Spring.Aop.Tests/Aspects/Cache/InvalidateCacheAdviceTests.cs index 17a51daf..21185d3c 100644 --- a/test/Spring/Spring.Aop.Tests/Aspects/Cache/InvalidateCacheAdviceTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aspects/Cache/InvalidateCacheAdviceTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using FakeItEasy; using NUnit.Framework; @@ -134,8 +130,6 @@ public sealed class InvalidateCacheAdviceTests } } -#region Inner Class : InvalidateCacheTarget - public sealed class InvalidateCacheTarget { [InvalidateCache("cache", Keys = "#key")] @@ -163,6 +157,4 @@ public sealed class InvalidateCacheTarget public void InvalidateWithCondition(int key) { } -} - -#endregion +} \ No newline at end of file diff --git a/test/Spring/Spring.Aop.Tests/Aspects/Exception/ExceptionHandlerAspectIntegrationTests.cs b/test/Spring/Spring.Aop.Tests/Aspects/Exception/ExceptionHandlerAspectIntegrationTests.cs index 299e8d33..8a5931f0 100644 --- a/test/Spring/Spring.Aop.Tests/Aspects/Exception/ExceptionHandlerAspectIntegrationTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aspects/Exception/ExceptionHandlerAspectIntegrationTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using Microsoft.Extensions.Logging; using NUnit.Framework; @@ -27,8 +21,6 @@ using Spring.Aop.Framework; using Spring.Objects; using Spring.Util; -#endregion - namespace Spring.Aspects.Exceptions; /// diff --git a/test/Spring/Spring.Aop.Tests/Aspects/Logging/SimpleLoggingAdviceTests.cs b/test/Spring/Spring.Aop.Tests/Aspects/Logging/SimpleLoggingAdviceTests.cs index 450db3fd..1d905533 100644 --- a/test/Spring/Spring.Aop.Tests/Aspects/Logging/SimpleLoggingAdviceTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aspects/Logging/SimpleLoggingAdviceTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using AopAlliance.Intercept; using FakeItEasy; diff --git a/test/Spring/Spring.Aop.Tests/Aspects/Logging/TestableSimpleLoggingAdvice.cs b/test/Spring/Spring.Aop.Tests/Aspects/Logging/TestableSimpleLoggingAdvice.cs index 87fff535..493be080 100644 --- a/test/Spring/Spring.Aop.Tests/Aspects/Logging/TestableSimpleLoggingAdvice.cs +++ b/test/Spring/Spring.Aop.Tests/Aspects/Logging/TestableSimpleLoggingAdvice.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using AopAlliance.Intercept; namespace Spring.Aspects.Logging; diff --git a/test/Spring/Spring.Aop.Tests/Aspects/RetryAdviceTests.cs b/test/Spring/Spring.Aop.Tests/Aspects/RetryAdviceTests.cs index 253ee4e2..1abc9124 100644 --- a/test/Spring/Spring.Aop.Tests/Aspects/RetryAdviceTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aspects/RetryAdviceTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using NUnit.Framework; using Spring.Aop.Framework; -#endregion - namespace Spring.Aspects; /// diff --git a/test/Spring/Spring.Aop.Tests/Aspects/Validation/ParameterValidationAdviceTests.cs b/test/Spring/Spring.Aop.Tests/Aspects/Validation/ParameterValidationAdviceTests.cs index 1a7c4a0f..71329155 100644 --- a/test/Spring/Spring.Aop.Tests/Aspects/Validation/ParameterValidationAdviceTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aspects/Validation/ParameterValidationAdviceTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using FakeItEasy; using NUnit.Framework; @@ -81,8 +77,6 @@ public sealed class ParameterValidationAdviceTests } } -#region Inner Class : ValidationTarget - public interface IValidationTarget { void Save(Inventor inventor); @@ -94,6 +88,4 @@ public sealed class ValidationTarget : IValidationTarget { inventor.Name = inventor.Name.ToUpper(); } -} - -#endregion +} \ No newline at end of file diff --git a/test/Spring/Spring.Benchmark/ContainerBenchmark.cs b/test/Spring/Spring.Benchmark/ContainerBenchmark.cs index 89a93767..94b5dd2b 100644 --- a/test/Spring/Spring.Benchmark/ContainerBenchmark.cs +++ b/test/Spring/Spring.Benchmark/ContainerBenchmark.cs @@ -1,5 +1,3 @@ -#region License - // /* // * Copyright 2018 the original author or authors. // * @@ -16,8 +14,6 @@ // * limitations under the License. // */ -#endregion - using BenchmarkDotNet.Attributes; using Spring.Benchmark.Classes; using Spring.Context.Support; diff --git a/test/Spring/Spring.Benchmark/HybridSetBenchmark.cs b/test/Spring/Spring.Benchmark/HybridSetBenchmark.cs index a03d3c29..e55e468b 100644 --- a/test/Spring/Spring.Benchmark/HybridSetBenchmark.cs +++ b/test/Spring/Spring.Benchmark/HybridSetBenchmark.cs @@ -1,5 +1,3 @@ -#region License - // /* // * Copyright 2018 the original author or authors. // * @@ -16,8 +14,6 @@ // * limitations under the License. // */ -#endregion - using BenchmarkDotNet.Attributes; using Spring.Collections; using Spring.Objects.Factory.Support; diff --git a/test/Spring/Spring.Core.Tests/Caching/AbstractCacheTests.cs b/test/Spring/Spring.Core.Tests/Caching/AbstractCacheTests.cs index fcbdda55..44521a38 100644 --- a/test/Spring/Spring.Core.Tests/Caching/AbstractCacheTests.cs +++ b/test/Spring/Spring.Core.Tests/Caching/AbstractCacheTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using FakeItEasy; using NUnit.Framework; @@ -31,8 +27,6 @@ namespace Spring.Caching; [TestFixture] public class AbstractCacheTests { - #region ExposingAbstractCache utility class - /// /// Exposes DoInsert() method for testing /// @@ -46,8 +40,6 @@ public class AbstractCacheTests public abstract void DoInsertExposed(object key, object value, TimeSpan timeToLive); } - #endregion - TimeSpan expectedPerItemTTL; TimeSpan expectedPerCacheTTL; ExposingAbstractCache cache; diff --git a/test/Spring/Spring.Core.Tests/Caching/BaseCacheAttributeTests.cs b/test/Spring/Spring.Core.Tests/Caching/BaseCacheAttributeTests.cs index 450a8f66..416c82ea 100644 --- a/test/Spring/Spring.Core.Tests/Caching/BaseCacheAttributeTests.cs +++ b/test/Spring/Spring.Core.Tests/Caching/BaseCacheAttributeTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Caching; /// diff --git a/test/Spring/Spring.Core.Tests/Collections/AbstractQueueTests.cs b/test/Spring/Spring.Core.Tests/Collections/AbstractQueueTests.cs index d0d76084..00e6b1c7 100644 --- a/test/Spring/Spring.Core.Tests/Collections/AbstractQueueTests.cs +++ b/test/Spring/Spring.Core.Tests/Collections/AbstractQueueTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using NUnit.Framework; -#endregion - namespace Spring.Collections; /// diff --git a/test/Spring/Spring.Core.Tests/Collections/CaseInsensitiveHashtableTests.cs b/test/Spring/Spring.Core.Tests/Collections/CaseInsensitiveHashtableTests.cs index 019722a9..2c994393 100644 --- a/test/Spring/Spring.Core.Tests/Collections/CaseInsensitiveHashtableTests.cs +++ b/test/Spring/Spring.Core.Tests/Collections/CaseInsensitiveHashtableTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Collections.Specialized; using System.Globalization; using System.Runtime.Serialization.Formatters.Binary; using NUnit.Framework; -#endregion - namespace Spring.Collections; /// diff --git a/test/Spring/Spring.Core.Tests/Collections/Generic/LinkedHashDictionaryTest.cs b/test/Spring/Spring.Core.Tests/Collections/Generic/LinkedHashDictionaryTest.cs index 003dc165..48ffd809 100644 --- a/test/Spring/Spring.Core.Tests/Collections/Generic/LinkedHashDictionaryTest.cs +++ b/test/Spring/Spring.Core.Tests/Collections/Generic/LinkedHashDictionaryTest.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2015-2015 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; namespace Spring.Collections.Generic; diff --git a/test/Spring/Spring.Core.Tests/Collections/Generic/ReadOnlyDictionaryTests.cs b/test/Spring/Spring.Core.Tests/Collections/Generic/ReadOnlyDictionaryTests.cs index 565ef866..31574a89 100644 --- a/test/Spring/Spring.Core.Tests/Collections/Generic/ReadOnlyDictionaryTests.cs +++ b/test/Spring/Spring.Core.Tests/Collections/Generic/ReadOnlyDictionaryTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; //using NUnit.Framework.SyntaxHelpers; -#endregion - namespace Spring.Collections.Generic; /// diff --git a/test/Spring/Spring.Core.Tests/Collections/HashedSetTests.cs b/test/Spring/Spring.Core.Tests/Collections/HashedSetTests.cs index f86841fc..ef574a44 100644 --- a/test/Spring/Spring.Core.Tests/Collections/HashedSetTests.cs +++ b/test/Spring/Spring.Core.Tests/Collections/HashedSetTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Collections; /// diff --git a/test/Spring/Spring.Core.Tests/Collections/HybridSetTests.cs b/test/Spring/Spring.Core.Tests/Collections/HybridSetTests.cs index 5b9ebc5d..8398e109 100644 --- a/test/Spring/Spring.Core.Tests/Collections/HybridSetTests.cs +++ b/test/Spring/Spring.Core.Tests/Collections/HybridSetTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Collections; /// diff --git a/test/Spring/Spring.Core.Tests/Collections/ImmutableSetTests.cs b/test/Spring/Spring.Core.Tests/Collections/ImmutableSetTests.cs index 8fa563e7..b05b0cec 100644 --- a/test/Spring/Spring.Core.Tests/Collections/ImmutableSetTests.cs +++ b/test/Spring/Spring.Core.Tests/Collections/ImmutableSetTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Collections; /// diff --git a/test/Spring/Spring.Core.Tests/Collections/LinkedListTests.cs b/test/Spring/Spring.Core.Tests/Collections/LinkedListTests.cs index a522d2c9..b608fb35 100644 --- a/test/Spring/Spring.Core.Tests/Collections/LinkedListTests.cs +++ b/test/Spring/Spring.Core.Tests/Collections/LinkedListTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using NUnit.Framework; -#endregion - namespace Spring.Collections; /// diff --git a/test/Spring/Spring.Core.Tests/Collections/ListSetTests.cs b/test/Spring/Spring.Core.Tests/Collections/ListSetTests.cs index 27c6e8e6..cc3db910 100644 --- a/test/Spring/Spring.Core.Tests/Collections/ListSetTests.cs +++ b/test/Spring/Spring.Core.Tests/Collections/ListSetTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Collections; /// diff --git a/test/Spring/Spring.Core.Tests/Collections/SetTests.cs b/test/Spring/Spring.Core.Tests/Collections/SetTests.cs index e15a8eca..2132596d 100644 --- a/test/Spring/Spring.Core.Tests/Collections/SetTests.cs +++ b/test/Spring/Spring.Core.Tests/Collections/SetTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Collections; /// diff --git a/test/Spring/Spring.Core.Tests/Collections/SortedSetTests.cs b/test/Spring/Spring.Core.Tests/Collections/SortedSetTests.cs index 8fd7177b..686f028a 100644 --- a/test/Spring/Spring.Core.Tests/Collections/SortedSetTests.cs +++ b/test/Spring/Spring.Core.Tests/Collections/SortedSetTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Collections; /// diff --git a/test/Spring/Spring.Core.Tests/Collections/StaticSetTests.cs b/test/Spring/Spring.Core.Tests/Collections/StaticSetTests.cs index b0aeec7a..97f77e35 100644 --- a/test/Spring/Spring.Core.Tests/Collections/StaticSetTests.cs +++ b/test/Spring/Spring.Core.Tests/Collections/StaticSetTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Collections; /// diff --git a/test/Spring/Spring.Core.Tests/Collections/SynchronizedHashtableTests.cs b/test/Spring/Spring.Core.Tests/Collections/SynchronizedHashtableTests.cs index c524ecc2..1e872ac3 100644 --- a/test/Spring/Spring.Core.Tests/Collections/SynchronizedHashtableTests.cs +++ b/test/Spring/Spring.Core.Tests/Collections/SynchronizedHashtableTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using NUnit.Framework; -#endregion - namespace Spring.Collections; /// diff --git a/test/Spring/Spring.Core.Tests/CommonTypes.cs b/test/Spring/Spring.Core.Tests/CommonTypes.cs index 7c652316..68556eea 100644 --- a/test/Spring/Spring.Core.Tests/CommonTypes.cs +++ b/test/Spring/Spring.Core.Tests/CommonTypes.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; namespace Spring; diff --git a/test/Spring/Spring.Core.Tests/CompilerOptionsTests.cs b/test/Spring/Spring.Core.Tests/CompilerOptionsTests.cs index ec597a20..2462e5e4 100644 --- a/test/Spring/Spring.Core.Tests/CompilerOptionsTests.cs +++ b/test/Spring/Spring.Core.Tests/CompilerOptionsTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Diagnostics; using System.Reflection; using NUnit.Framework; -#endregion - namespace Spring; /// @@ -38,16 +30,12 @@ namespace Spring; /// public abstract class CompilerOptionsTests { - #region Tests - [Test] public void TestBuildCompliance() { ProcessAssembly(AssemblyToCheck); } - #endregion - private void ProcessAssembly(Assembly assembly) { object[] attributes = assembly.GetCustomAttributes(typeof(DebuggableAttribute), false); @@ -113,8 +101,6 @@ public abstract class CompilerOptionsTests } } - #region Properties - /// /// Specify the assembly whose metadata will be checked for a given release mode (debug/release). /// @@ -124,7 +110,5 @@ public abstract class CompilerOptionsTests set { _assemblyToCheck = value; } } - #endregion - private Assembly _assemblyToCheck = null; } diff --git a/test/Spring/Spring.Core.Tests/Context/Attributes/AbstractConfigurationClassPostProcessorTests.cs b/test/Spring/Spring.Core.Tests/Context/Attributes/AbstractConfigurationClassPostProcessorTests.cs index f4012c85..26084005 100644 --- a/test/Spring/Spring.Core.Tests/Context/Attributes/AbstractConfigurationClassPostProcessorTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Attributes/AbstractConfigurationClassPostProcessorTests.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Context.Support; using Spring.Objects.Factory.Support; diff --git a/test/Spring/Spring.Core.Tests/Context/Attributes/AssemblyObjectDefinitionScannerTests.cs b/test/Spring/Spring.Core.Tests/Context/Attributes/AssemblyObjectDefinitionScannerTests.cs index 52745de4..34cbae32 100644 --- a/test/Spring/Spring.Core.Tests/Context/Attributes/AssemblyObjectDefinitionScannerTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Attributes/AssemblyObjectDefinitionScannerTests.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Objects.Factory.Support; diff --git a/test/Spring/Spring.Core.Tests/Context/Attributes/AssemblyTypeScannerTests.cs b/test/Spring/Spring.Core.Tests/Context/Attributes/AssemblyTypeScannerTests.cs index 0d024445..fd27fe0c 100644 --- a/test/Spring/Spring.Core.Tests/Context/Attributes/AssemblyTypeScannerTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Attributes/AssemblyTypeScannerTests.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Core; using Spring.Util; @@ -27,16 +23,12 @@ namespace Spring.Context.Attributes; [TestFixture] public class AssemblyTypeScannerTests { - #region Setup/Teardown - [SetUp] public void _TestSetup() { _scanner = new AssemblyObjectDefinitionScanner(); } - #endregion - [Test] public void AssemblyHavingType_T_Adds_Assembly() { diff --git a/test/Spring/Spring.Core.Tests/Context/Attributes/CodeConfigApplicationContextTests.cs b/test/Spring/Spring.Core.Tests/Context/Attributes/CodeConfigApplicationContextTests.cs index 9423ac7e..5fd386f3 100644 --- a/test/Spring/Spring.Core.Tests/Context/Attributes/CodeConfigApplicationContextTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Attributes/CodeConfigApplicationContextTests.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Context.Support; diff --git a/test/Spring/Spring.Core.Tests/Context/Attributes/ConfigurationClassObjectDefinitionReaderTests.cs b/test/Spring/Spring.Core.Tests/Context/Attributes/ConfigurationClassObjectDefinitionReaderTests.cs index 682e21a5..2d9e6d21 100644 --- a/test/Spring/Spring.Core.Tests/Context/Attributes/ConfigurationClassObjectDefinitionReaderTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Attributes/ConfigurationClassObjectDefinitionReaderTests.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Objects.Factory.Support; diff --git a/test/Spring/Spring.Core.Tests/Context/Attributes/ConfigurationClassParserTests.cs b/test/Spring/Spring.Core.Tests/Context/Attributes/ConfigurationClassParserTests.cs index 6c9b5841..476ed1f5 100644 --- a/test/Spring/Spring.Core.Tests/Context/Attributes/ConfigurationClassParserTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Attributes/ConfigurationClassParserTests.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Context.Attributes; using Spring.Objects.Factory.Parsing; diff --git a/test/Spring/Spring.Core.Tests/Context/Attributes/ConfigurationClassPostProcessorTests.cs b/test/Spring/Spring.Core.Tests/Context/Attributes/ConfigurationClassPostProcessorTests.cs index 02c94fef..a8a0a631 100644 --- a/test/Spring/Spring.Core.Tests/Context/Attributes/ConfigurationClassPostProcessorTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Attributes/ConfigurationClassPostProcessorTests.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Context.Support; using Spring.Objects.Factory.Support; diff --git a/test/Spring/Spring.Core.Tests/Context/Attributes/ImportResourceAttributeTests.cs b/test/Spring/Spring.Core.Tests/Context/Attributes/ImportResourceAttributeTests.cs index 542757b9..3dff90c0 100644 --- a/test/Spring/Spring.Core.Tests/Context/Attributes/ImportResourceAttributeTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Attributes/ImportResourceAttributeTests.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Objects.Factory.Xml; using Spring.Objects.Factory.Support; diff --git a/test/Spring/Spring.Core.Tests/Context/Attributes/ObjectDefAttributeTests.cs b/test/Spring/Spring.Core.Tests/Context/Attributes/ObjectDefAttributeTests.cs index 537707fc..dce3e3c9 100644 --- a/test/Spring/Spring.Core.Tests/Context/Attributes/ObjectDefAttributeTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Attributes/ObjectDefAttributeTests.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; namespace Spring.Context.Attributes; diff --git a/test/Spring/Spring.Core.Tests/Context/Attributes/ScanningConfigurationClassPostProcessorTests.cs b/test/Spring/Spring.Core.Tests/Context/Attributes/ScanningConfigurationClassPostProcessorTests.cs index f7715641..98c283c7 100644 --- a/test/Spring/Spring.Core.Tests/Context/Attributes/ScanningConfigurationClassPostProcessorTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Attributes/ScanningConfigurationClassPostProcessorTests.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Context.Support; using Spring.Objects.Factory.Xml; diff --git a/test/Spring/Spring.Core.Tests/Context/Attributes/SimpleScanTests.cs b/test/Spring/Spring.Core.Tests/Context/Attributes/SimpleScanTests.cs index 047ddd74..6823ff16 100644 --- a/test/Spring/Spring.Core.Tests/Context/Attributes/SimpleScanTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Attributes/SimpleScanTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2010-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using NUnit.Framework; using Spring.Context.Support; diff --git a/test/Spring/Spring.Core.Tests/Context/CommonTypes.cs b/test/Spring/Spring.Core.Tests/Context/CommonTypes.cs index 00744e2c..559e98e8 100644 --- a/test/Spring/Spring.Core.Tests/Context/CommonTypes.cs +++ b/test/Spring/Spring.Core.Tests/Context/CommonTypes.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Context.Support; using Spring.Core.IO; @@ -27,8 +21,6 @@ using Spring.Objects; using Spring.Objects.Factory.Config; using Spring.Objects.Factory.Support; -#endregion - namespace Spring.Context; /// @@ -135,8 +127,6 @@ public class MockApplicationContext : AbstractApplicationContext actualCloseCalls++; } - #region IMockObject Members - public void NotImplemented(string methodName) { throw new NotImplementedException(methodName + " is not currently implemented"); @@ -148,10 +138,6 @@ public class MockApplicationContext : AbstractApplicationContext set { _mockName = value; } } - #endregion - - #region IVerifiable Members - public void Verify() { Assert.AreEqual(actualCloseCalls, expectedCloseCalls, "Did not receive the expected Count for object " + MockName); @@ -162,6 +148,4 @@ public class MockApplicationContext : AbstractApplicationContext { get { return _isVerified; } } - - #endregion } diff --git a/test/Spring/Spring.Core.Tests/Context/Config/AttributeConfigObjectDefinitionParserTests.cs b/test/Spring/Spring.Core.Tests/Context/Config/AttributeConfigObjectDefinitionParserTests.cs index 6323b07c..d7f68db0 100644 --- a/test/Spring/Spring.Core.Tests/Context/Config/AttributeConfigObjectDefinitionParserTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Config/AttributeConfigObjectDefinitionParserTests.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Context.Attributes; using Spring.Context.Support; diff --git a/test/Spring/Spring.Core.Tests/Context/Config/ComponentScanObjectDefinitionParserTests.cs b/test/Spring/Spring.Core.Tests/Context/Config/ComponentScanObjectDefinitionParserTests.cs index 8c985cb3..5c91c824 100644 --- a/test/Spring/Spring.Core.Tests/Context/Config/ComponentScanObjectDefinitionParserTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Config/ComponentScanObjectDefinitionParserTests.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Context.Attributes; using Spring.Context.Support; diff --git a/test/Spring/Spring.Core.Tests/Context/Config/ComponentScanObjectDefinitionParserTypeFilterTests.cs b/test/Spring/Spring.Core.Tests/Context/Config/ComponentScanObjectDefinitionParserTypeFilterTests.cs index 2d1d58e0..a2bb6028 100644 --- a/test/Spring/Spring.Core.Tests/Context/Config/ComponentScanObjectDefinitionParserTypeFilterTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Config/ComponentScanObjectDefinitionParserTypeFilterTests.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Context.Attributes; using Spring.Context.Attributes.TypeFilters; diff --git a/test/Spring/Spring.Core.Tests/Context/Config/ContextNamespaceParserTests.cs b/test/Spring/Spring.Core.Tests/Context/Config/ContextNamespaceParserTests.cs index 0b971284..58859c81 100644 --- a/test/Spring/Spring.Core.Tests/Context/Config/ContextNamespaceParserTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Config/ContextNamespaceParserTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2010-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Objects.Factory.Xml; diff --git a/test/Spring/Spring.Core.Tests/Context/ContextExceptionTests.cs b/test/Spring/Spring.Core.Tests/Context/ContextExceptionTests.cs index dc6355ae..f9967039 100644 --- a/test/Spring/Spring.Core.Tests/Context/ContextExceptionTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/ContextExceptionTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; -#endregion - namespace Spring.Context; /// diff --git a/test/Spring/Spring.Core.Tests/Context/ContextListenerObject.cs b/test/Spring/Spring.Core.Tests/Context/ContextListenerObject.cs index 97bad6a8..e94d9250 100644 --- a/test/Spring/Spring.Core.Tests/Context/ContextListenerObject.cs +++ b/test/Spring/Spring.Core.Tests/Context/ContextListenerObject.cs @@ -1,7 +1,5 @@ using Spring.Context.Events; -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -18,8 +16,6 @@ using Spring.Context.Events; * limitations under the License. */ -#endregion - namespace Spring.Context; /// diff --git a/test/Spring/Spring.Core.Tests/Context/EventListenerAttributeTests.cs b/test/Spring/Spring.Core.Tests/Context/EventListenerAttributeTests.cs index 8e5059af..09f00441 100644 --- a/test/Spring/Spring.Core.Tests/Context/EventListenerAttributeTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/EventListenerAttributeTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; namespace Spring.Context; diff --git a/test/Spring/Spring.Core.Tests/Context/Events/ConsoleListenerTests.cs b/test/Spring/Spring.Core.Tests/Context/Events/ConsoleListenerTests.cs index 0eef674c..6a0aee3a 100644 --- a/test/Spring/Spring.Core.Tests/Context/Events/ConsoleListenerTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Events/ConsoleListenerTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; namespace Spring.Context.Events; diff --git a/test/Spring/Spring.Core.Tests/Context/Support/AbstractApplicationContextTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/AbstractApplicationContextTests.cs index 29fbf8ca..67b066ba 100644 --- a/test/Spring/Spring.Core.Tests/Context/Support/AbstractApplicationContextTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Support/AbstractApplicationContextTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using FakeItEasy; using NUnit.Framework; using Spring.Core; @@ -207,8 +203,6 @@ public class AbstractApplicationContextTests Assert.IsNull(_context.ParentContext.ParentContext, "parent is null"); } - #region OrderOfKnownProcessorInterfaces Utility Classes - public enum ObjectProcessingState { SetObjectName, @@ -335,8 +329,6 @@ public class AbstractApplicationContextTests } } - #endregion - [Test] public void OrderOfKnownProcessorInterfaces() { diff --git a/test/Spring/Spring.Core.Tests/Context/Support/AbstractMessageSourceTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/AbstractMessageSourceTests.cs index ee673123..caaf4d15 100644 --- a/test/Spring/Spring.Core.Tests/Context/Support/AbstractMessageSourceTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Support/AbstractMessageSourceTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using FakeItEasy; using NUnit.Framework; diff --git a/test/Spring/Spring.Core.Tests/Context/Support/ApplicationContextAwareProcessorTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/ApplicationContextAwareProcessorTests.cs index fff7abc0..ec1e6d6e 100644 --- a/test/Spring/Spring.Core.Tests/Context/Support/ApplicationContextAwareProcessorTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Support/ApplicationContextAwareProcessorTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Security.Policy; using NUnit.Framework; diff --git a/test/Spring/Spring.Core.Tests/Context/Support/ApplicationContextExtensionTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/ApplicationContextExtensionTests.cs index 7f47e075..ad25e770 100644 --- a/test/Spring/Spring.Core.Tests/Context/Support/ApplicationContextExtensionTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Support/ApplicationContextExtensionTests.cs @@ -1,8 +1,6 @@ using NUnit.Framework; using Spring.Objects; -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -19,8 +17,6 @@ using Spring.Objects; * limitations under the License. */ -#endregion - namespace Spring.Context.Support; /// diff --git a/test/Spring/Spring.Core.Tests/Context/Support/Assembler.cs b/test/Spring/Spring.Core.Tests/Context/Support/Assembler.cs index b733211e..56e166c3 100644 --- a/test/Spring/Spring.Core.Tests/Context/Support/Assembler.cs +++ b/test/Spring/Spring.Core.Tests/Context/Support/Assembler.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - namespace Spring.Context.Support; -#region Test Utility Classes - -#endregion - /// Mark Pollack public class Assembler { diff --git a/test/Spring/Spring.Core.Tests/Context/Support/CodeConfigApplicationContextTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/CodeConfigApplicationContextTests.cs index 45a33ed6..524da5b3 100644 --- a/test/Spring/Spring.Core.Tests/Context/Support/CodeConfigApplicationContextTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Support/CodeConfigApplicationContextTests.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2010-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Context.Attributes; diff --git a/test/Spring/Spring.Core.Tests/Context/Support/ContextLocatorHandlerTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/ContextLocatorHandlerTests.cs index 2501db53..61a3a450 100644 --- a/test/Spring/Spring.Core.Tests/Context/Support/ContextLocatorHandlerTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Support/ContextLocatorHandlerTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Configuration; using System.Xml; using NUnit.Framework; @@ -27,8 +21,6 @@ using Spring.Objects.Factory; using Spring.Util; using ConfigurationException = System.Configuration.ConfigurationException; -#endregion - namespace Spring.Context.Support; /// diff --git a/test/Spring/Spring.Core.Tests/Context/Support/ContextRegistryTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/ContextRegistryTests.cs index a4bf4cf3..4c42c66c 100644 --- a/test/Spring/Spring.Core.Tests/Context/Support/ContextRegistryTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Support/ContextRegistryTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Configuration; using System.Reflection; using System.Xml; @@ -30,8 +24,6 @@ using Spring.Objects.Factory.Support; using Spring.Util; using ConfigurationException = System.Configuration.ConfigurationException; -#endregion - namespace Spring.Context.Support; /// diff --git a/test/Spring/Spring.Core.Tests/Context/Support/DefaultMessageSourceResolvableTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/DefaultMessageSourceResolvableTests.cs index c73c5cd1..49e48807 100644 --- a/test/Spring/Spring.Core.Tests/Context/Support/DefaultMessageSourceResolvableTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Support/DefaultMessageSourceResolvableTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Text; using FakeItEasy; using NUnit.Framework; diff --git a/test/Spring/Spring.Core.Tests/Context/Support/DelegatingMessageSourceTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/DelegatingMessageSourceTests.cs index ccbef67c..001254c2 100644 --- a/test/Spring/Spring.Core.Tests/Context/Support/DelegatingMessageSourceTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Support/DelegatingMessageSourceTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using FakeItEasy; using NUnit.Framework; diff --git a/test/Spring/Spring.Core.Tests/Context/Support/Logic.cs b/test/Spring/Spring.Core.Tests/Context/Support/Logic.cs index 946acd9e..e5f6d9cd 100644 --- a/test/Spring/Spring.Core.Tests/Context/Support/Logic.cs +++ b/test/Spring/Spring.Core.Tests/Context/Support/Logic.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects.Factory; namespace Spring.Context.Support; @@ -33,12 +29,8 @@ public class Logic : IObjectNameAware set { assembler = value; } } - #region IObjectNameAware Members - public string ObjectName { set { objectName = value; } } - - #endregion } diff --git a/test/Spring/Spring.Core.Tests/Context/Support/MessageSourceAccessorTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/MessageSourceAccessorTests.cs index 5e575c35..b16e7290 100644 --- a/test/Spring/Spring.Core.Tests/Context/Support/MessageSourceAccessorTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Support/MessageSourceAccessorTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using FakeItEasy; using NUnit.Framework; diff --git a/test/Spring/Spring.Core.Tests/Context/Support/NamespaceParsersSectionHandlerTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/NamespaceParsersSectionHandlerTests.cs index b2fd02d1..44563dfc 100644 --- a/test/Spring/Spring.Core.Tests/Context/Support/NamespaceParsersSectionHandlerTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Support/NamespaceParsersSectionHandlerTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Configuration; using System.Xml; using NUnit.Framework; -#endregion - namespace Spring.Context.Support; /// diff --git a/test/Spring/Spring.Core.Tests/Context/Support/NullMessageSourceTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/NullMessageSourceTests.cs index 39fec133..40995dba 100644 --- a/test/Spring/Spring.Core.Tests/Context/Support/NullMessageSourceTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Support/NullMessageSourceTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; namespace Spring.Context.Support; diff --git a/test/Spring/Spring.Core.Tests/Context/Support/ResourceSetMessageSourceTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/ResourceSetMessageSourceTests.cs index 124ef927..2ad0f1c8 100644 --- a/test/Spring/Spring.Core.Tests/Context/Support/ResourceSetMessageSourceTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Support/ResourceSetMessageSourceTests.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using System.Reflection; using System.Resources; diff --git a/test/Spring/Spring.Core.Tests/Context/Support/Service.cs b/test/Spring/Spring.Core.Tests/Context/Support/Service.cs index c29b20a0..395722c5 100644 --- a/test/Spring/Spring.Core.Tests/Context/Support/Service.cs +++ b/test/Spring/Spring.Core.Tests/Context/Support/Service.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Context.Support; /// Mark Pollack diff --git a/test/Spring/Spring.Core.Tests/Context/Support/StaticApplicationContextTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/StaticApplicationContextTests.cs index 9345ddef..e944e5b4 100644 --- a/test/Spring/Spring.Core.Tests/Context/Support/StaticApplicationContextTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Support/StaticApplicationContextTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using NUnit.Framework; diff --git a/test/Spring/Spring.Core.Tests/Context/Support/StaticMessageSourceTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/StaticMessageSourceTests.cs index 37ba8ca4..67331c61 100644 --- a/test/Spring/Spring.Core.Tests/Context/Support/StaticMessageSourceTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Support/StaticMessageSourceTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using NUnit.Framework; using Spring.Globalization; diff --git a/test/Spring/Spring.Core.Tests/Context/Support/TestObjectConfigParser.cs b/test/Spring/Spring.Core.Tests/Context/Support/TestObjectConfigParser.cs index a67e9c72..e3d0a202 100644 --- a/test/Spring/Spring.Core.Tests/Context/Support/TestObjectConfigParser.cs +++ b/test/Spring/Spring.Core.Tests/Context/Support/TestObjectConfigParser.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Xml; using Spring.Objects; using Spring.Objects.Factory.Config; diff --git a/test/Spring/Spring.Core.Tests/Context/Support/TypeAliasesSectionHandlerTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/TypeAliasesSectionHandlerTests.cs index cedaf0bd..b3b6c0e8 100644 --- a/test/Spring/Spring.Core.Tests/Context/Support/TypeAliasesSectionHandlerTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Support/TypeAliasesSectionHandlerTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Configuration; using System.Xml; using NUnit.Framework; using Spring.Core.TypeResolution; using Spring.Objects; -#endregion - namespace Spring.Context.Support; /// diff --git a/test/Spring/Spring.Core.Tests/Context/Support/XmlApplicationContextTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/XmlApplicationContextTests.cs index d2fe6c31..5a0d475f 100644 --- a/test/Spring/Spring.Core.Tests/Context/Support/XmlApplicationContextTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Support/XmlApplicationContextTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2005 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Core; using Spring.Objects; @@ -281,8 +277,6 @@ public sealed class XmlApplicationContextTests genericCtx = new GenericApplicationContext("test", true, ctx); } - #region Helper classes - public class DisposeTester : IDisposable { private bool isDisposed = false; @@ -339,8 +333,6 @@ public sealed class XmlApplicationContextTests count++; } - #region IObjectPostProcessor Members - /// /// No op implementation /// @@ -362,8 +354,6 @@ public sealed class XmlApplicationContextTests { return obj; } - - #endregion } /// @@ -390,8 +380,6 @@ public sealed class XmlApplicationContextTests count++; } - #region IObjectFactoryPostProcessor Members - /// /// no op /// @@ -399,19 +387,13 @@ public sealed class XmlApplicationContextTests public void PostProcessObjectFactory(IConfigurableListableObjectFactory factory) { } - - #endregion } - - #endregion } public class SingletonTestingObjectPostProcessor : IObjectPostProcessor, IApplicationContextAware { private IApplicationContext applicationContext; - #region IObjectPostProcessor Members - public object PostProcessBeforeInitialization(object instance, string name) { return instance; @@ -428,14 +410,8 @@ public class SingletonTestingObjectPostProcessor : IObjectPostProcessor, IApplic return instance; } - #endregion - - #region IApplicationContextAware Members - public IApplicationContext ApplicationContext { set { this.applicationContext = value; } } - - #endregion } diff --git a/test/Spring/Spring.Core.Tests/Core/ComposedCriteriaTests.cs b/test/Spring/Spring.Core.Tests/Core/ComposedCriteriaTests.cs index 19ed089c..13584c2f 100644 --- a/test/Spring/Spring.Core.Tests/Core/ComposedCriteriaTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/ComposedCriteriaTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Text.RegularExpressions; using NUnit.Framework; -#endregion - namespace Spring.Core; [TestFixture] diff --git a/test/Spring/Spring.Core.Tests/Core/ControlFlowFactoryTests.cs b/test/Spring/Spring.Core.Tests/Core/ControlFlowFactoryTests.cs index c8f93f59..5439464b 100644 --- a/test/Spring/Spring.Core.Tests/Core/ControlFlowFactoryTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/ControlFlowFactoryTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; using Spring.Objects; -#endregion - namespace Spring.Core; /// diff --git a/test/Spring/Spring.Core.Tests/Core/IO/AssemblyResourceTest.cs b/test/Spring/Spring.Core.Tests/Core/IO/AssemblyResourceTest.cs index 8abd0391..0b416055 100644 --- a/test/Spring/Spring.Core.Tests/Core/IO/AssemblyResourceTest.cs +++ b/test/Spring/Spring.Core.Tests/Core/IO/AssemblyResourceTest.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Core.IO; /// @@ -34,8 +26,6 @@ namespace Spring.Core.IO; [TestFixture] public class AssemblyResourceTest { - #region SetUp/TearDown - [SetUp] public void SetUp() { @@ -46,8 +36,6 @@ public class AssemblyResourceTest { } - #endregion - /// /// Use incorrect format for an assembly resource. Using /// comma delimited instead of '/'. diff --git a/test/Spring/Spring.Core.Tests/Core/IO/ConfigurableResourceLoaderTests.cs b/test/Spring/Spring.Core.Tests/Core/IO/ConfigurableResourceLoaderTests.cs index 232c1621..fbc71f7f 100644 --- a/test/Spring/Spring.Core.Tests/Core/IO/ConfigurableResourceLoaderTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/IO/ConfigurableResourceLoaderTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Core.IO; /// @@ -41,8 +33,6 @@ public sealed class ConfigurableResourceLoaderTests loader = new ConfigurableResourceLoader(); } - #region ConfigurableResourceLoader.GetResource Tests - /// /// Tests that loader correctly loads files specified by absolute name, regardless /// of the fact whether protocol name is specified or not. @@ -174,8 +164,6 @@ public sealed class ConfigurableResourceLoaderTests Assert.AreEqual(typeof(AssemblyResource), res.GetType()); } - #endregion - [Test] public void GetResourceForNonMappedProtocol() { diff --git a/test/Spring/Spring.Core.Tests/Core/IO/EncodedResourceTests.cs b/test/Spring/Spring.Core.Tests/Core/IO/EncodedResourceTests.cs index b7e0d44f..8b0d8d3f 100644 --- a/test/Spring/Spring.Core.Tests/Core/IO/EncodedResourceTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/IO/EncodedResourceTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Text; using NUnit.Framework; using Spring.Util; diff --git a/test/Spring/Spring.Core.Tests/Core/IO/FileSystemResourceCommonTests.cs b/test/Spring/Spring.Core.Tests/Core/IO/FileSystemResourceCommonTests.cs index 1d4c3627..af126a93 100644 --- a/test/Spring/Spring.Core.Tests/Core/IO/FileSystemResourceCommonTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/IO/FileSystemResourceCommonTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; -#endregion - namespace Spring.Core.IO; /// diff --git a/test/Spring/Spring.Core.Tests/Core/IO/FileSystemResourceTests.cs b/test/Spring/Spring.Core.Tests/Core/IO/FileSystemResourceTests.cs index 2f8a6906..61d14f63 100644 --- a/test/Spring/Spring.Core.Tests/Core/IO/FileSystemResourceTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/IO/FileSystemResourceTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Core.IO; /// diff --git a/test/Spring/Spring.Core.Tests/Core/IO/InputStreamResourceTests.cs b/test/Spring/Spring.Core.Tests/Core/IO/InputStreamResourceTests.cs index 523f0504..795c8f3d 100644 --- a/test/Spring/Spring.Core.Tests/Core/IO/InputStreamResourceTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/IO/InputStreamResourceTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Core.IO; /// diff --git a/test/Spring/Spring.Core.Tests/Core/IO/ResourceConverterTests.cs b/test/Spring/Spring.Core.Tests/Core/IO/ResourceConverterTests.cs index 37b2013f..75aea8d6 100644 --- a/test/Spring/Spring.Core.Tests/Core/IO/ResourceConverterTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/IO/ResourceConverterTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using Microsoft.Extensions.Logging.Abstractions; using NUnit.Framework; -#endregion - namespace Spring.Core.IO; /// diff --git a/test/Spring/Spring.Core.Tests/Core/IO/ResourceHandlerRegistryTests.cs b/test/Spring/Spring.Core.Tests/Core/IO/ResourceHandlerRegistryTests.cs index 708335a0..91040ce1 100644 --- a/test/Spring/Spring.Core.Tests/Core/IO/ResourceHandlerRegistryTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/IO/ResourceHandlerRegistryTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Core.IO; /// diff --git a/test/Spring/Spring.Core.Tests/Core/IO/StringResourceTests.cs b/test/Spring/Spring.Core.Tests/Core/IO/StringResourceTests.cs index a8581d87..1b5bacd4 100644 --- a/test/Spring/Spring.Core.Tests/Core/IO/StringResourceTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/IO/StringResourceTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Text; using NUnit.Framework; -#endregion - namespace Spring.Core.IO; /// diff --git a/test/Spring/Spring.Core.Tests/Core/IO/UrlResourceTest.cs b/test/Spring/Spring.Core.Tests/Core/IO/UrlResourceTest.cs index 83d5d98c..dbeef904 100644 --- a/test/Spring/Spring.Core.Tests/Core/IO/UrlResourceTest.cs +++ b/test/Spring/Spring.Core.Tests/Core/IO/UrlResourceTest.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Core.IO; /// diff --git a/test/Spring/Spring.Core.Tests/Core/MethodArgumentsCriteriaTests.cs b/test/Spring/Spring.Core.Tests/Core/MethodArgumentsCriteriaTests.cs index 4a8bc0e6..009eba8c 100644 --- a/test/Spring/Spring.Core.Tests/Core/MethodArgumentsCriteriaTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/MethodArgumentsCriteriaTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; using Spring.Objects; -#endregion - namespace Spring.Core; /// diff --git a/test/Spring/Spring.Core.Tests/Core/MethodGenericArgumentsCountCriteriaTests.cs b/test/Spring/Spring.Core.Tests/Core/MethodGenericArgumentsCountCriteriaTests.cs index 75eb2cd6..a7e3bd95 100644 --- a/test/Spring/Spring.Core.Tests/Core/MethodGenericArgumentsCountCriteriaTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/MethodGenericArgumentsCountCriteriaTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; -#endregion - namespace Spring.Core; /// diff --git a/test/Spring/Spring.Core.Tests/Core/MethodParametersCountCriteriaTests.cs b/test/Spring/Spring.Core.Tests/Core/MethodParametersCountCriteriaTests.cs index 3033bc07..06be3b11 100644 --- a/test/Spring/Spring.Core.Tests/Core/MethodParametersCountCriteriaTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/MethodParametersCountCriteriaTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; -#endregion - namespace Spring.Core; /// diff --git a/test/Spring/Spring.Core.Tests/Core/MethodParametersCriteriaTests.cs b/test/Spring/Spring.Core.Tests/Core/MethodParametersCriteriaTests.cs index 538347fa..8903a05e 100644 --- a/test/Spring/Spring.Core.Tests/Core/MethodParametersCriteriaTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/MethodParametersCriteriaTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; using Spring.Objects; -#endregion - namespace Spring.Core; /// diff --git a/test/Spring/Spring.Core.Tests/Core/MethodReturnTypeCriteriaTests.cs b/test/Spring/Spring.Core.Tests/Core/MethodReturnTypeCriteriaTests.cs index 2ae9640f..a8068683 100644 --- a/test/Spring/Spring.Core.Tests/Core/MethodReturnTypeCriteriaTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/MethodReturnTypeCriteriaTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; -#endregion - namespace Spring.Core; /// diff --git a/test/Spring/Spring.Core.Tests/Core/OrderComparatorTests.cs b/test/Spring/Spring.Core.Tests/Core/OrderComparatorTests.cs index 21125be5..5478bf92 100644 --- a/test/Spring/Spring.Core.Tests/Core/OrderComparatorTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/OrderComparatorTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Util; -#endregion - namespace Spring.Core; /// diff --git a/test/Spring/Spring.Core.Tests/Core/RegularExpressionEventNameCriteriaTests.cs b/test/Spring/Spring.Core.Tests/Core/RegularExpressionEventNameCriteriaTests.cs index 58c16a62..77d88e02 100644 --- a/test/Spring/Spring.Core.Tests/Core/RegularExpressionEventNameCriteriaTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/RegularExpressionEventNameCriteriaTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using Spring.Objects; using NUnit.Framework; -#endregion - namespace Spring.Core; /// diff --git a/test/Spring/Spring.Core.Tests/Core/RegularExpressionMethodNameCriteriaTests.cs b/test/Spring/Spring.Core.Tests/Core/RegularExpressionMethodNameCriteriaTests.cs index 107cd66d..476d1cd0 100644 --- a/test/Spring/Spring.Core.Tests/Core/RegularExpressionMethodNameCriteriaTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/RegularExpressionMethodNameCriteriaTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using Spring.Objects; using NUnit.Framework; -#endregion - namespace Spring.Core; /// diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/CredentialConverterTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/CredentialConverterTests.cs index 7fac7d71..a3242180 100644 --- a/test/Spring/Spring.Core.Tests/Core/TypeConversion/CredentialConverterTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/CredentialConverterTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Net; using NUnit.Framework; -#endregion - namespace Spring.Core.TypeConversion; /// diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/CustomNumberConverterTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/CustomNumberConverterTests.cs index 7220232f..0c5e93f5 100644 --- a/test/Spring/Spring.Core.Tests/Core/TypeConversion/CustomNumberConverterTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/CustomNumberConverterTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Globalization; using NUnit.Framework; -#endregion - namespace Spring.Core.TypeConversion; /// diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/FileInfoConverterTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/FileInfoConverterTests.cs index ebfa97cf..1b39f9b0 100644 --- a/test/Spring/Spring.Core.Tests/Core/TypeConversion/FileInfoConverterTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/FileInfoConverterTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Core.TypeConversion; /// diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/NameValueConverterTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/NameValueConverterTests.cs index deb80733..cc85b13e 100644 --- a/test/Spring/Spring.Core.Tests/Core/TypeConversion/NameValueConverterTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/NameValueConverterTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections.Specialized; using NUnit.Framework; using Spring.Objects; -#endregion - namespace Spring.Core.TypeConversion; /// diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/RGBColorConverterTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/RGBColorConverterTests.cs index ab424bcc..97c04287 100644 --- a/test/Spring/Spring.Core.Tests/Core/TypeConversion/RGBColorConverterTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/RGBColorConverterTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Drawing; using NUnit.Framework; -#endregion - namespace Spring.Core.TypeConversion; /// diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/RegexConverterTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/RegexConverterTests.cs index 6591aaf5..d2365001 100644 --- a/test/Spring/Spring.Core.Tests/Core/TypeConversion/RegexConverterTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/RegexConverterTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Text.RegularExpressions; using NUnit.Framework; -#endregion - namespace Spring.Core.TypeConversion; /// diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/RegistryKeyConverterTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/RegistryKeyConverterTests.cs index fc47d298..b0e1af7f 100644 --- a/test/Spring/Spring.Core.Tests/Core/TypeConversion/RegistryKeyConverterTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/RegistryKeyConverterTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Win32; using NUnit.Framework; diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/ResourceManagerTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/ResourceManagerTests.cs index 9038d47b..21ba4b7d 100644 --- a/test/Spring/Spring.Core.Tests/Core/TypeConversion/ResourceManagerTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/ResourceManagerTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Resources; using NUnit.Framework; -#endregion - namespace Spring.Core.TypeConversion; /// diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/RuntimeTypeConverterTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/RuntimeTypeConverterTests.cs index 752d78d9..4e19297c 100644 --- a/test/Spring/Spring.Core.Tests/Core/TypeConversion/RuntimeTypeConverterTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/RuntimeTypeConverterTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Core.TypeConversion; /// diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/StreamConverterTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/StreamConverterTests.cs index d5f0bc70..8fb80148 100644 --- a/test/Spring/Spring.Core.Tests/Core/TypeConversion/StreamConverterTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/StreamConverterTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Net; using NUnit.Framework; -#endregion - namespace Spring.Core.TypeConversion; /// diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/StringArrayConverterTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/StringArrayConverterTests.cs index 610b4e2b..d0d1d578 100644 --- a/test/Spring/Spring.Core.Tests/Core/TypeConversion/StringArrayConverterTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/StringArrayConverterTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Globalization; using NUnit.Framework; using Spring.Util; -#endregion - namespace Spring.Core.TypeConversion; /// diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/TimeSpanConverterTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/TimeSpanConverterTests.cs index 07552d09..11f943d9 100644 --- a/test/Spring/Spring.Core.Tests/Core/TypeConversion/TimeSpanConverterTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/TimeSpanConverterTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Core.TypeConversion; /// diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/TypeConversionUtilsTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/TypeConversionUtilsTests.cs index 93eee8b7..0653df17 100644 --- a/test/Spring/Spring.Core.Tests/Core/TypeConversion/TypeConversionUtilsTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/TypeConversionUtilsTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Core.TypeConversion; /// diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/TypeConverterRegistryTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/TypeConverterRegistryTests.cs index 20523afa..1346c05a 100644 --- a/test/Spring/Spring.Core.Tests/Core/TypeConversion/TypeConverterRegistryTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/TypeConverterRegistryTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.ComponentModel; using NUnit.Framework; -#endregion - namespace Spring.Core.TypeConversion; /// diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/UniqueKeyConverterTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/UniqueKeyConverterTests.cs index 2f081b5a..1a57dcee 100644 --- a/test/Spring/Spring.Core.Tests/Core/TypeConversion/UniqueKeyConverterTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/UniqueKeyConverterTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.ComponentModel; using NUnit.Framework; using Spring.Util; -#endregion - namespace Spring.Core.TypeConversion; /// diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/UriConverterTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/UriConverterTests.cs index f112b33d..27a421d3 100644 --- a/test/Spring/Spring.Core.Tests/Core/TypeConversion/UriConverterTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/UriConverterTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Core.TypeConversion; /// diff --git a/test/Spring/Spring.Core.Tests/Core/TypeResolution/CachedTypeResolverTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeResolution/CachedTypeResolverTests.cs index 6cf95744..0b54261b 100644 --- a/test/Spring/Spring.Core.Tests/Core/TypeResolution/CachedTypeResolverTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/TypeResolution/CachedTypeResolverTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using FakeItEasy; using NUnit.Framework; diff --git a/test/Spring/Spring.Core.Tests/Core/TypeResolution/GenericTypeResolverTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeResolution/GenericTypeResolverTests.cs index d752df14..1a5b5874 100644 --- a/test/Spring/Spring.Core.Tests/Core/TypeResolution/GenericTypeResolverTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/TypeResolution/GenericTypeResolverTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Objects; -#endregion - namespace Spring.Core.TypeResolution; /// diff --git a/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeAssemblyHolderTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeAssemblyHolderTests.cs index 61f809a8..fa547a29 100644 --- a/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeAssemblyHolderTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeAssemblyHolderTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Objects; -#endregion - namespace Spring.Core.TypeResolution; /// diff --git a/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeRegistryTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeRegistryTests.cs index e5892a6d..a425032b 100644 --- a/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeRegistryTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeRegistryTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Objects; using Spring.Objects.Factory; @@ -27,8 +21,6 @@ using IBar = Spring.Objects.Factory.IBar; using Spring.Context; using Spring.Context.Support; -#endregion - namespace Spring.Core.TypeResolution; /// diff --git a/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeResolutionUtilsTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeResolutionUtilsTests.cs index f0feadaa..25dad4f8 100644 --- a/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeResolutionUtilsTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeResolutionUtilsTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; using Spring.Objects; -#endregion - namespace Spring.Core.TypeResolution; /// @@ -100,12 +92,8 @@ public sealed class TypeResolutionUtilsTests Assert.IsTrue(TypeResolutionUtils.MethodMatch("AddPeriodicElement(string, string)", addPeriodicElementMethod), "Should match 'AddPeriodicElement(string, string)'"); } - #region Helper classes - internal interface IFoo { bool Spanglish(string foo, object[] args); } - - #endregion } diff --git a/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeResolverTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeResolverTests.cs index d066dc22..a36e674f 100644 --- a/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeResolverTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeResolverTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Data; using NUnit.Framework; using Spring.Objects; -#endregion - namespace Spring.Core.TypeResolution; /// diff --git a/test/Spring/Spring.Core.Tests/CoreCompilerOptionsTests.cs b/test/Spring/Spring.Core.Tests/CoreCompilerOptionsTests.cs index aa7e7726..7d54a848 100644 --- a/test/Spring/Spring.Core.Tests/CoreCompilerOptionsTests.cs +++ b/test/Spring/Spring.Core.Tests/CoreCompilerOptionsTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; using Spring.Objects; -#endregion - namespace Spring; /// Test that the AOP assembly is built with the correct DebugAttributes in release and debug builds. diff --git a/test/Spring/Spring.Core.Tests/CoreExceptionTests.cs b/test/Spring/Spring.Core.Tests/CoreExceptionTests.cs index db8989b8..12fcb2a4 100644 --- a/test/Spring/Spring.Core.Tests/CoreExceptionTests.cs +++ b/test/Spring/Spring.Core.Tests/CoreExceptionTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; using Spring.Objects; -#endregion - namespace Spring; /// diff --git a/test/Spring/Spring.Core.Tests/DataBinding/BaseBindingManagerTests.cs b/test/Spring/Spring.Core.Tests/DataBinding/BaseBindingManagerTests.cs index f8a7c90a..fa3be818 100644 --- a/test/Spring/Spring.Core.Tests/DataBinding/BaseBindingManagerTests.cs +++ b/test/Spring/Spring.Core.Tests/DataBinding/BaseBindingManagerTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using NUnit.Framework; using Spring.Core; diff --git a/test/Spring/Spring.Core.Tests/DataBinding/SimpleExpressionBindingTests.cs b/test/Spring/Spring.Core.Tests/DataBinding/SimpleExpressionBindingTests.cs index a9a89ad1..2d784367 100644 --- a/test/Spring/Spring.Core.Tests/DataBinding/SimpleExpressionBindingTests.cs +++ b/test/Spring/Spring.Core.Tests/DataBinding/SimpleExpressionBindingTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; namespace Spring.DataBinding; diff --git a/test/Spring/Spring.Core.Tests/Example/Scannable/FooService.cs b/test/Spring/Spring.Core.Tests/Example/Scannable/FooService.cs index 78c9afd5..34341d39 100644 --- a/test/Spring/Spring.Core.Tests/Example/Scannable/FooService.cs +++ b/test/Spring/Spring.Core.Tests/Example/Scannable/FooService.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2010-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Stereotype; namespace Spring.Example.Scannable; diff --git a/test/Spring/Spring.Core.Tests/Example/Scannable/IFooDao.cs b/test/Spring/Spring.Core.Tests/Example/Scannable/IFooDao.cs index ce08d6d8..966725d7 100644 --- a/test/Spring/Spring.Core.Tests/Example/Scannable/IFooDao.cs +++ b/test/Spring/Spring.Core.Tests/Example/Scannable/IFooDao.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2010-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Example.Scannable; /// diff --git a/test/Spring/Spring.Core.Tests/Example/Scannable/IFooService.cs b/test/Spring/Spring.Core.Tests/Example/Scannable/IFooService.cs index 2038c9e9..6a8f807b 100644 --- a/test/Spring/Spring.Core.Tests/Example/Scannable/IFooService.cs +++ b/test/Spring/Spring.Core.Tests/Example/Scannable/IFooService.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2010-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Example.Scannable; /// diff --git a/test/Spring/Spring.Core.Tests/Example/Scannable/StubFooDao.cs b/test/Spring/Spring.Core.Tests/Example/Scannable/StubFooDao.cs index edaefabd..e979a1f5 100644 --- a/test/Spring/Spring.Core.Tests/Example/Scannable/StubFooDao.cs +++ b/test/Spring/Spring.Core.Tests/Example/Scannable/StubFooDao.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2010-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Stereotype; namespace Spring.Example.Scannable; diff --git a/test/Spring/Spring.Core.Tests/ExceptionsTest.cs b/test/Spring/Spring.Core.Tests/ExceptionsTest.cs index eedbbd2b..d64b86c8 100644 --- a/test/Spring/Spring.Core.Tests/ExceptionsTest.cs +++ b/test/Spring/Spring.Core.Tests/ExceptionsTest.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using System.Reflection; using System.Runtime.Serialization; @@ -53,8 +49,6 @@ public abstract class ExceptionsTest : StandardsComplianceTest CheckedType = typeof(Exception); } - #region Tests - [Test] public void TestStandardsCompliance() { @@ -67,10 +61,6 @@ public abstract class ExceptionsTest : StandardsComplianceTest ProcessAssembly(Assembly.GetAssembly(GetType())); } - #endregion - - #region Methods - protected override void CheckStandardsCompliance(Assembly assembly, Type t) { // check to see that the exception is correctly named, with "Exception" at the end @@ -258,10 +248,6 @@ public abstract class ExceptionsTest : StandardsComplianceTest } } - #endregion - - #region Properties - /// /// We will test all of the exceptions in this assembly for their correctness. /// @@ -271,13 +257,9 @@ public abstract class ExceptionsTest : StandardsComplianceTest set { _assemblyToCheck = value; } } - #endregion - private Assembly _assemblyToCheck = null; } -#region Inner Class : SimpleTestException - /// /// Do nothing exception to verify that the exception tester /// is working correctly. @@ -285,8 +267,6 @@ public abstract class ExceptionsTest : StandardsComplianceTest [Serializable] public class SimpleTestException : ApplicationException { - #region Public Instance Constructors - public SimpleTestException() { } @@ -300,38 +280,22 @@ public class SimpleTestException : ApplicationException { } - #endregion Public Instance Constructors - - #region Protected Instance Constructors - // deserialization constructor protected SimpleTestException( SerializationInfo info, StreamingContext context) : base(info, context) { } - - #endregion Protected Instance Constructors } -#endregion - -#region Inner Class : TestException - /// /// Exception to verify that the exception tester is working correctly. /// [Serializable] public class TestException : ApplicationException, ISerializable { - #region Private Instance Fields - private int _value; - #endregion Private Instance Fields - - #region Public Instance Constructors - public TestException() { } @@ -351,29 +315,17 @@ public class TestException : ApplicationException, ISerializable _value = value; } - #endregion Public Instance Constructors - - #region Protected Instance Constructors - // deserialization constructor protected TestException(SerializationInfo info, StreamingContext context) : base(info, context) { _value = info.GetInt32("Value"); } - #endregion Protected Instance Constructors - - #region Public Instance Properties - public int Value { get { return _value; } } - #endregion Public Instance Properties - - #region Override implementation of ApplicationException - // Called by the frameworks during serialization // to fetch the data from an object. public override void GetObjectData( @@ -397,14 +349,8 @@ public class TestException : ApplicationException, ISerializable return base.Message + Environment.NewLine + s; } } - - #endregion Override implementation of ApplicationException } -#endregion - -#region Inner Class : SealedTestException - /// /// Exception to verify that the exception tester is working on /// sealed exception. @@ -412,8 +358,6 @@ public class TestException : ApplicationException, ISerializable [Serializable] public sealed class SealedTestException : TestException { - #region Public Instance Constructors - public SealedTestException() { } @@ -433,18 +377,10 @@ public sealed class SealedTestException : TestException { } - #endregion Public Instance Constructors - - #region Private Instance Constructors - // deserialization constructor private SealedTestException( SerializationInfo info, StreamingContext context) : base(info, context) { } - - #endregion Private Instance Constructors -} - -#endregion +} \ No newline at end of file diff --git a/test/Spring/Spring.Core.Tests/Expressions/ConstructorNodeTests.cs b/test/Spring/Spring.Core.Tests/Expressions/ConstructorNodeTests.cs index 57a058eb..9ff0eedf 100644 --- a/test/Spring/Spring.Core.Tests/Expressions/ConstructorNodeTests.cs +++ b/test/Spring/Spring.Core.Tests/Expressions/ConstructorNodeTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Expressions; /// @@ -33,8 +25,6 @@ namespace Spring.Expressions; [TestFixture] public class ConstructorNodeTests { - #region Test Classes - public class PublicTestClass { public string _s; @@ -60,8 +50,6 @@ public class ConstructorNodeTests } } - #endregion Test Classes - [Test] public void CanCreatePublicInstance() { diff --git a/test/Spring/Spring.Core.Tests/Expressions/ExpressionEvaluatorTests.cs b/test/Spring/Spring.Core.Tests/Expressions/ExpressionEvaluatorTests.cs index 286b7ed4..7086f818 100644 --- a/test/Spring/Spring.Core.Tests/Expressions/ExpressionEvaluatorTests.cs +++ b/test/Spring/Spring.Core.Tests/Expressions/ExpressionEvaluatorTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Diagnostics; using System.EnterpriseServices; @@ -45,8 +39,6 @@ using Spring.Objects.Factory; using Spring.Threading; using Spring.Util; -#endregion - namespace Spring.Expressions; /// @@ -56,8 +48,6 @@ namespace Spring.Expressions; [TestFixture] public sealed class ExpressionEvaluatorTests { - #region Helper classes for threading tests - public class AsyncTestExpressionEvaluation : AsyncTestTask { private IExpression exp; @@ -82,14 +72,10 @@ public sealed class ExpressionEvaluatorTests } } - #endregion - private Inventor tesla; private Inventor pupin; private Society ieee; - #region SetUp and TearDown - /// /// The setup logic executed before the execution of each individual test. /// @@ -123,10 +109,6 @@ public sealed class ExpressionEvaluatorTests //DynamicCodeManager.SaveAssembly(); } - #endregion - - #region Serialization Tests - /// /// GetObjectData() is not overridden on purpose !!! /// @@ -261,8 +243,6 @@ public sealed class ExpressionEvaluatorTests return exp; } - #endregion Serialization Tests - [Test] public void TestConstantRead() { @@ -1798,8 +1778,6 @@ public sealed class ExpressionEvaluatorTests new Dictionary())); } - #region Collection Processor and Aggregator tests - [Test] public void TestCountAggregator() { @@ -2033,8 +2011,6 @@ public sealed class ExpressionEvaluatorTests Assert.AreEqual(new object[] { 4.1f, "3", 2.1m, 1, "0" }, result); } - #endregion - /// /// Type SetValue. /// @@ -2603,8 +2579,6 @@ public sealed class ExpressionEvaluatorTests Assert.AreEqual("PublicMethod", ExpressionEvaluator.GetValue(cases, "GetPublicMethod()")); } - #region TestAccessVisibility Classes - internal class AccessVisibilityCases { private readonly string _privateReadonlyField = "_privateReadonlyField"; @@ -2632,20 +2606,12 @@ public sealed class ExpressionEvaluatorTests public string GetPublicMethod() { return "PublicMethod"; } } - #endregion - - #region TestMethodInvocation Classes - class MethodInvokationCases { public string Foo(string stringArg) { return stringArg; } public int Foo(int intArg) { return intArg; } } - #endregion - - #region Set operations tests - [Test] public void TestUnionOperator() { @@ -2772,10 +2738,6 @@ public sealed class ExpressionEvaluatorTests Assert.Throws(() => ExpressionEvaluator.GetValue(null, "#{1:'one', 2:'two', 3:'three'} - 'something'")); } - #endregion - - #region Performance tests - private DateTime start, stop; //[Test] @@ -2856,10 +2818,6 @@ public sealed class ExpressionEvaluatorTests iterations / duration)); } - #endregion - - #region Method Inheritance tests - [Test] public void TestInheritedMethodInvocation() { @@ -2879,8 +2837,6 @@ public sealed class ExpressionEvaluatorTests Assert.AreEqual("DerivedSingleMethodTestClass.ShadowedStaticMethod", ExpressionEvaluator.GetValue(null, string.Format("T({0}).ShadowedStaticMethod()", typeof(DerivedSingleMethodTestClass).FullName))); } - #endregion - private static void DumpNode(AST rootNode, int level) { Trace.WriteLine(new string(' ', level) + rootNode.ToString()); @@ -2898,8 +2854,6 @@ public sealed class ExpressionEvaluatorTests } } -#region Helper classes - internal class SingleMethodTestClass { protected static string GetMethodName(MethodBase method) @@ -3102,10 +3056,6 @@ internal class Sample } } -#endregion - -#region Shadowing Test Helper Classes - internal class ShadowingTestsBaseClass { private object _someValue; @@ -3156,6 +3106,4 @@ internal class ShadowingTestsMoreSpezializedClass : ShadowingTestsSpezializedCla internal class ShadowingTestsMostSpezializedClass : ShadowingTestsMoreSpezializedClass { -} - -#endregion // Shadowing Test Helper Classes \ No newline at end of file +} \ No newline at end of file diff --git a/test/Spring/Spring.Core.Tests/Expressions/FunctionNodeTests.cs b/test/Spring/Spring.Core.Tests/Expressions/FunctionNodeTests.cs index d5feead3..67f1dc36 100644 --- a/test/Spring/Spring.Core.Tests/Expressions/FunctionNodeTests.cs +++ b/test/Spring/Spring.Core.Tests/Expressions/FunctionNodeTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Expressions; /// diff --git a/test/Spring/Spring.Core.Tests/Expressions/MethodNodeTests.cs b/test/Spring/Spring.Core.Tests/Expressions/MethodNodeTests.cs index fa71bdfe..122e31f8 100644 --- a/test/Spring/Spring.Core.Tests/Expressions/MethodNodeTests.cs +++ b/test/Spring/Spring.Core.Tests/Expressions/MethodNodeTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using NUnit.Framework; using Spring.Expressions.Processors; -#endregion - namespace Spring.Expressions; /// @@ -94,8 +86,6 @@ public class MethodNodeTests } } - #region StopWatch - private class StopWatch { private DateTime _startTime; @@ -145,6 +135,4 @@ public class MethodNodeTests get { return _elapsed; } } } - - #endregion } diff --git a/test/Spring/Spring.Core.Tests/Expressions/OpADDTests.cs b/test/Spring/Spring.Core.Tests/Expressions/OpADDTests.cs index 284889dc..ee3f0e52 100644 --- a/test/Spring/Spring.Core.Tests/Expressions/OpADDTests.cs +++ b/test/Spring/Spring.Core.Tests/Expressions/OpADDTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; namespace Spring.Expressions; diff --git a/test/Spring/Spring.Core.Tests/Expressions/OpANDTests.cs b/test/Spring/Spring.Core.Tests/Expressions/OpANDTests.cs index 78c36c48..0aed304e 100644 --- a/test/Spring/Spring.Core.Tests/Expressions/OpANDTests.cs +++ b/test/Spring/Spring.Core.Tests/Expressions/OpANDTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; namespace Spring.Expressions; diff --git a/test/Spring/Spring.Core.Tests/Expressions/OpORTests.cs b/test/Spring/Spring.Core.Tests/Expressions/OpORTests.cs index e97b95ab..a32031f7 100644 --- a/test/Spring/Spring.Core.Tests/Expressions/OpORTests.cs +++ b/test/Spring/Spring.Core.Tests/Expressions/OpORTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; namespace Spring.Expressions; diff --git a/test/Spring/Spring.Core.Tests/Expressions/OpXORTests.cs b/test/Spring/Spring.Core.Tests/Expressions/OpXORTests.cs index 25bd8cc4..3fe98ae8 100644 --- a/test/Spring/Spring.Core.Tests/Expressions/OpXORTests.cs +++ b/test/Spring/Spring.Core.Tests/Expressions/OpXORTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; namespace Spring.Expressions; diff --git a/test/Spring/Spring.Core.Tests/Expressions/Processors/ConversionProcessorTests.cs b/test/Spring/Spring.Core.Tests/Expressions/Processors/ConversionProcessorTests.cs index 15fc9b96..cbf94672 100644 --- a/test/Spring/Spring.Core.Tests/Expressions/Processors/ConversionProcessorTests.cs +++ b/test/Spring/Spring.Core.Tests/Expressions/Processors/ConversionProcessorTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using NUnit.Framework; using Spring.Globalization; -#endregion - namespace Spring.Expressions.Processors; /// diff --git a/test/Spring/Spring.Core.Tests/Expressions/Processors/OrderByProcessorTests.cs b/test/Spring/Spring.Core.Tests/Expressions/Processors/OrderByProcessorTests.cs index 01c42f41..4cdb550d 100644 --- a/test/Spring/Spring.Core.Tests/Expressions/Processors/OrderByProcessorTests.cs +++ b/test/Spring/Spring.Core.Tests/Expressions/Processors/OrderByProcessorTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Expressions.Processors; /// diff --git a/test/Spring/Spring.Core.Tests/Expressions/PropertyOrFieldNodeTests.cs b/test/Spring/Spring.Core.Tests/Expressions/PropertyOrFieldNodeTests.cs index bf5f79f8..80c0544e 100644 --- a/test/Spring/Spring.Core.Tests/Expressions/PropertyOrFieldNodeTests.cs +++ b/test/Spring/Spring.Core.Tests/Expressions/PropertyOrFieldNodeTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Objects; diff --git a/test/Spring/Spring.Core.Tests/Expressions/ReferenceNodeTests.cs b/test/Spring/Spring.Core.Tests/Expressions/ReferenceNodeTests.cs index 6c934d35..63ce545e 100644 --- a/test/Spring/Spring.Core.Tests/Expressions/ReferenceNodeTests.cs +++ b/test/Spring/Spring.Core.Tests/Expressions/ReferenceNodeTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Context; using Spring.Context.Support; diff --git a/test/Spring/Spring.Core.Tests/Expressions/SelectionNodeTests.cs b/test/Spring/Spring.Core.Tests/Expressions/SelectionNodeTests.cs index c7df982e..aabf52f4 100644 --- a/test/Spring/Spring.Core.Tests/Expressions/SelectionNodeTests.cs +++ b/test/Spring/Spring.Core.Tests/Expressions/SelectionNodeTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using NUnit.Framework; -#endregion - namespace Spring.Expressions; /// diff --git a/test/Spring/Spring.Core.Tests/Globalization/AbstractLocalizerTests.cs b/test/Spring/Spring.Core.Tests/Globalization/AbstractLocalizerTests.cs index 074fff6f..7af64994 100644 --- a/test/Spring/Spring.Core.Tests/Globalization/AbstractLocalizerTests.cs +++ b/test/Spring/Spring.Core.Tests/Globalization/AbstractLocalizerTests.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Globalization; using NUnit.Framework; using Spring.Context; -#endregion - namespace Spring.Globalization; /// diff --git a/test/Spring/Spring.Core.Tests/Globalization/CultureInfoUtils.cs b/test/Spring/Spring.Core.Tests/Globalization/CultureInfoUtils.cs index 5fc02f76..cabea1ea 100644 --- a/test/Spring/Spring.Core.Tests/Globalization/CultureInfoUtils.cs +++ b/test/Spring/Spring.Core.Tests/Globalization/CultureInfoUtils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; namespace Spring.Globalization; diff --git a/test/Spring/Spring.Core.Tests/Globalization/CultureTestScope.cs b/test/Spring/Spring.Core.Tests/Globalization/CultureTestScope.cs index 08edcf06..b41186ca 100644 --- a/test/Spring/Spring.Core.Tests/Globalization/CultureTestScope.cs +++ b/test/Spring/Spring.Core.Tests/Globalization/CultureTestScope.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Globalization; -#endregion - namespace Spring.Globalization; /// diff --git a/test/Spring/Spring.Core.Tests/Globalization/Formatters/CurrencyFormatterTests.cs b/test/Spring/Spring.Core.Tests/Globalization/Formatters/CurrencyFormatterTests.cs index 25048028..d92e1edc 100644 --- a/test/Spring/Spring.Core.Tests/Globalization/Formatters/CurrencyFormatterTests.cs +++ b/test/Spring/Spring.Core.Tests/Globalization/Formatters/CurrencyFormatterTests.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; namespace Spring.Globalization.Formatters; diff --git a/test/Spring/Spring.Core.Tests/Globalization/Formatters/DateTimeFormatterTests.cs b/test/Spring/Spring.Core.Tests/Globalization/Formatters/DateTimeFormatterTests.cs index 166990b3..2967a030 100644 --- a/test/Spring/Spring.Core.Tests/Globalization/Formatters/DateTimeFormatterTests.cs +++ b/test/Spring/Spring.Core.Tests/Globalization/Formatters/DateTimeFormatterTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; namespace Spring.Globalization.Formatters; diff --git a/test/Spring/Spring.Core.Tests/Globalization/Formatters/FilteringFormatterTests.cs b/test/Spring/Spring.Core.Tests/Globalization/Formatters/FilteringFormatterTests.cs index e75fd79b..7e990774 100644 --- a/test/Spring/Spring.Core.Tests/Globalization/Formatters/FilteringFormatterTests.cs +++ b/test/Spring/Spring.Core.Tests/Globalization/Formatters/FilteringFormatterTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using FakeItEasy; using NUnit.Framework; diff --git a/test/Spring/Spring.Core.Tests/Globalization/Formatters/FloatFormatterTests.cs b/test/Spring/Spring.Core.Tests/Globalization/Formatters/FloatFormatterTests.cs index 58c5d286..cdbe1444 100644 --- a/test/Spring/Spring.Core.Tests/Globalization/Formatters/FloatFormatterTests.cs +++ b/test/Spring/Spring.Core.Tests/Globalization/Formatters/FloatFormatterTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; namespace Spring.Globalization.Formatters; diff --git a/test/Spring/Spring.Core.Tests/Globalization/Formatters/HasTextFilteringFormatterTests.cs b/test/Spring/Spring.Core.Tests/Globalization/Formatters/HasTextFilteringFormatterTests.cs index 98cbe99a..37dac2f3 100644 --- a/test/Spring/Spring.Core.Tests/Globalization/Formatters/HasTextFilteringFormatterTests.cs +++ b/test/Spring/Spring.Core.Tests/Globalization/Formatters/HasTextFilteringFormatterTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Globalization.Formatters; /// diff --git a/test/Spring/Spring.Core.Tests/Globalization/Formatters/IntegerFormatterTests.cs b/test/Spring/Spring.Core.Tests/Globalization/Formatters/IntegerFormatterTests.cs index c4ec6aa6..5471d37d 100644 --- a/test/Spring/Spring.Core.Tests/Globalization/Formatters/IntegerFormatterTests.cs +++ b/test/Spring/Spring.Core.Tests/Globalization/Formatters/IntegerFormatterTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; namespace Spring.Globalization.Formatters; diff --git a/test/Spring/Spring.Core.Tests/Globalization/Formatters/NumberFormatterTests.cs b/test/Spring/Spring.Core.Tests/Globalization/Formatters/NumberFormatterTests.cs index 973cb6fb..b33bc474 100644 --- a/test/Spring/Spring.Core.Tests/Globalization/Formatters/NumberFormatterTests.cs +++ b/test/Spring/Spring.Core.Tests/Globalization/Formatters/NumberFormatterTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; namespace Spring.Globalization.Formatters; diff --git a/test/Spring/Spring.Core.Tests/Globalization/Formatters/PercentFormatterTests.cs b/test/Spring/Spring.Core.Tests/Globalization/Formatters/PercentFormatterTests.cs index 4eba78d4..fe0b56e7 100644 --- a/test/Spring/Spring.Core.Tests/Globalization/Formatters/PercentFormatterTests.cs +++ b/test/Spring/Spring.Core.Tests/Globalization/Formatters/PercentFormatterTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; namespace Spring.Globalization.Formatters; diff --git a/test/Spring/Spring.Core.Tests/Globalization/Localizers/ResourceSetLocalizerTests.cs b/test/Spring/Spring.Core.Tests/Globalization/Localizers/ResourceSetLocalizerTests.cs index 5bd2666f..896b3726 100644 --- a/test/Spring/Spring.Core.Tests/Globalization/Localizers/ResourceSetLocalizerTests.cs +++ b/test/Spring/Spring.Core.Tests/Globalization/Localizers/ResourceSetLocalizerTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Globalization; using System.Resources; using NUnit.Framework; using Spring.Context; using Spring.Context.Support; -#endregion - namespace Spring.Globalization.Localizers; /// diff --git a/test/Spring/Spring.Core.Tests/Globalization/Resolvers/DefaultCultureResolverTests.cs b/test/Spring/Spring.Core.Tests/Globalization/Resolvers/DefaultCultureResolverTests.cs index 24fad4a0..55eda83f 100644 --- a/test/Spring/Spring.Core.Tests/Globalization/Resolvers/DefaultCultureResolverTests.cs +++ b/test/Spring/Spring.Core.Tests/Globalization/Resolvers/DefaultCultureResolverTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Globalization; using NUnit.Framework; -#endregion - namespace Spring.Globalization.Resolvers; /// diff --git a/test/Spring/Spring.Core.Tests/HookableContextHandler.cs b/test/Spring/Spring.Core.Tests/HookableContextHandler.cs index 1eb1939d..f1a4307c 100644 --- a/test/Spring/Spring.Core.Tests/HookableContextHandler.cs +++ b/test/Spring/Spring.Core.Tests/HookableContextHandler.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Configuration; using System.Xml; using Spring.Context.Support; -#endregion - namespace Spring; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/DerivedTestObject.cs b/test/Spring/Spring.Core.Tests/Objects/DerivedTestObject.cs index 50a7a152..9e085eec 100644 --- a/test/Spring/Spring.Core.Tests/Objects/DerivedTestObject.cs +++ b/test/Spring/Spring.Core.Tests/Objects/DerivedTestObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Objects; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Events/Support/EventManipulationUtilsTests.cs b/test/Spring/Spring.Core.Tests/Objects/Events/Support/EventManipulationUtilsTests.cs index 1d39e319..90b8b048 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Events/Support/EventManipulationUtilsTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Events/Support/EventManipulationUtilsTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; -#endregion - namespace Spring.Objects.Events.Support.Tests; /// @@ -81,8 +73,6 @@ public sealed class EventManipulationUtilsTests } } - #region Helper Classes - internal delegate void Delegate1(object source, string name); internal delegate string Delegate2(string name, bool flag); @@ -142,6 +132,4 @@ public sealed class EventManipulationUtilsTests return String.Empty; } } - - #endregion } \ No newline at end of file diff --git a/test/Spring/Spring.Core.Tests/Objects/Events/Support/EventRegistryTests.cs b/test/Spring/Spring.Core.Tests/Objects/Events/Support/EventRegistryTests.cs index d9a3c4bf..087895ce 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Events/Support/EventRegistryTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Events/Support/EventRegistryTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; namespace Spring.Objects.Events.Support.Tests; @@ -25,8 +21,6 @@ namespace Spring.Objects.Events.Support.Tests; [TestFixture] public class EventRegistryTests { - #region Helper Classes - internal delegate void SimpleClientEvent(object sender, MyClientEventArgs args); internal delegate string SimpleClientEvent2(MyClientEventArgs args); @@ -167,8 +161,6 @@ public class EventRegistryTests } } - #endregion - [Test] public void RespectsInheritance() { diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/AbstractListableObjectFactoryTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/AbstractListableObjectFactoryTests.cs index f026bade..82373f86 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/AbstractListableObjectFactoryTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/AbstractListableObjectFactoryTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Objects.Factory; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/AbstractObjectFactoryTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/AbstractObjectFactoryTests.cs index 9505b844..ccab8939 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/AbstractObjectFactoryTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/AbstractObjectFactoryTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Core.IO; using Spring.Objects.Factory.Config; @@ -28,8 +22,6 @@ using Spring.Objects.Factory.Xml; using Spring.Threading; using System.Collections; -#endregion - namespace Spring.Objects.Factory; /// @@ -40,8 +32,6 @@ namespace Spring.Objects.Factory; /// Rick Evans (.NET) public abstract class AbstractObjectFactoryTests { - #region Properties - protected internal abstract AbstractObjectFactory CreateObjectFactory(bool caseSensitive); private AbstractObjectFactory cachedFactory; @@ -52,10 +42,6 @@ public abstract class AbstractObjectFactoryTests set { cachedFactory = value; } } - #endregion - - #region Case Insensitive Tests - [Test] public void RespectsCaseInsensitiveNamesAndAliases() { @@ -80,8 +66,6 @@ public abstract class AbstractObjectFactoryTests Assert.AreEqual(testObject, of.GetObject("ALIAS")); } - #endregion - /// /// Roderick objects inherits from rod, overriding name only. /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/AutowireByQualifierAttributeTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/AutowireByQualifierAttributeTests.cs index 56b84af5..098e2a8d 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/AutowireByQualifierAttributeTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/AutowireByQualifierAttributeTests.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Context.Support; using Spring.Objects.Factory.Attributes.ByType; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/AutowireByQualifierTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/AutowireByQualifierTests.cs index 39eaaae1..f381d41d 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/AutowireByQualifierTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/AutowireByQualifierTests.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Context.Support; using Spring.Objects.Factory.Attributes.ByType; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/AutowireByTypeFailTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/AutowireByTypeFailTests.cs index ae8676bf..101f2c06 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/AutowireByTypeFailTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/AutowireByTypeFailTests.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Context.Support; using Spring.Objects.Factory.Attributes.ByType; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/AutowireByTypeNormalTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/AutowireByTypeNormalTests.cs index 1223c748..8a796a71 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/AutowireByTypeNormalTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/AutowireByTypeNormalTests.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Context.Support; using Spring.Objects.Factory.Attributes.ByType; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/AutowireByTypeNotRequiredTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/AutowireByTypeNotRequiredTests.cs index 94d250fd..8b285ef0 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/AutowireByTypeNotRequiredTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/AutowireByTypeNotRequiredTests.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Context.Support; using Spring.Objects.Factory.Attributes.ByType; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/AutowireByTypePrimaryTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/AutowireByTypePrimaryTests.cs index 8482a557..ee8a9483 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/AutowireByTypePrimaryTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/AutowireByTypePrimaryTests.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Context.Support; using Spring.Objects.Factory.Attributes.ByType; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/AutowireByValueTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/AutowireByValueTests.cs index 614c98e7..aeb1e15e 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/AutowireByValueTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/AutowireByValueTests.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Context.Support; using Spring.Objects.Factory.Attributes.ByValue; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/AutowireCollectionTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/AutowireCollectionTests.cs index da845c01..c389c9b9 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/AutowireCollectionTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/AutowireCollectionTests.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Context.Support; using Spring.Objects.Factory.Attributes.ByType; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/MyRequiredAttribute.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/MyRequiredAttribute.cs index e65ca70e..56fc81a2 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/MyRequiredAttribute.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/MyRequiredAttribute.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory.Attributes; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/PostConstructAttributeTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/PostConstructAttributeTests.cs index 10cfa8bb..80440bb8 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/PostConstructAttributeTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/PostConstructAttributeTests.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Context.Support; using Spring.Objects.Factory.Config; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/PreDestroyAttributeTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/PreDestroyAttributeTests.cs index edc999eb..7106035e 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/PreDestroyAttributeTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/PreDestroyAttributeTests.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Context.Support; using Spring.Objects.Factory.Config; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/RequiredAttributeObjectPostProcessorTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/RequiredAttributeObjectPostProcessorTests.cs index 8a41f09f..00259f87 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/RequiredAttributeObjectPostProcessorTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/RequiredAttributeObjectPostProcessorTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; using Spring.Context.Support; -#endregion - namespace Spring.Objects.Factory.Attributes; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/RequiredTestObject.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/RequiredTestObject.cs index 3683b222..154f8db7 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/RequiredTestObject.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/RequiredTestObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory.Attributes; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/ConcurrentObjectFactoryTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/ConcurrentObjectFactoryTests.cs index 0a8be595..b2844cec 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/ConcurrentObjectFactoryTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/ConcurrentObjectFactoryTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Core.IO; using Spring.Objects.Factory.Xml; @@ -88,13 +84,9 @@ public class ConcurrentObjectFactoryTests this.test = test; } - #region Overrides of AsyncTestTask - public override void DoExecute() { test.PerformTest(); } - - #endregion } } diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/AbstractFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/AbstractFactoryObjectTests.cs index 74885030..0a7705ca 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/AbstractFactoryObjectTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/AbstractFactoryObjectTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using FakeItEasy; using NUnit.Framework; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/CommandLineArgsVariableSourceTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/CommandLineArgsVariableSourceTests.cs index d9be5b80..87a66b1e 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/CommandLineArgsVariableSourceTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/CommandLineArgsVariableSourceTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Objects.Factory.Config; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConfigSectionVariableSourceTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConfigSectionVariableSourceTests.cs index 8670ccd6..03fc4a5e 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConfigSectionVariableSourceTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConfigSectionVariableSourceTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Objects.Factory.Config; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConfigurableVariableSourceTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConfigurableVariableSourceTests.cs index c172b0fb..f6954caa 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConfigurableVariableSourceTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConfigurableVariableSourceTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; namespace Spring.Objects.Factory.Config; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConfigurationReaderTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConfigurationReaderTests.cs index 7b911bf5..f94eb6cb 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConfigurationReaderTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConfigurationReaderTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections.Specialized; using System.Configuration; using System.Text; using NUnit.Framework; using Spring.Core.IO; -#endregion - namespace Spring.Objects.Factory.Config; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConnectionStringsVariableSourceTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConnectionStringsVariableSourceTests.cs index 98e4fa64..1deba452 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConnectionStringsVariableSourceTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConnectionStringsVariableSourceTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Objects.Factory.Config; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConstructorArgumentValuesTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConstructorArgumentValuesTests.cs index c44f7a51..c9b0614b 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConstructorArgumentValuesTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConstructorArgumentValuesTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Collections; -#endregion - namespace Spring.Objects.Factory.Config; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/CustomConverterConfigurerTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/CustomConverterConfigurerTests.cs index ca6cad77..1c670787 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/CustomConverterConfigurerTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/CustomConverterConfigurerTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.ComponentModel; using System.Drawing; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/DelegateFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/DelegateFactoryObjectTests.cs index 31267b7a..f9bee7b3 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/DelegateFactoryObjectTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/DelegateFactoryObjectTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Util; -#endregion - namespace Spring.Objects.Factory.Config; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/DelegateObjectFactoryConfigurerTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/DelegateObjectFactoryConfigurerTests.cs index e51b302f..91d69329 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/DelegateObjectFactoryConfigurerTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/DelegateObjectFactoryConfigurerTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Context; using Spring.Context.Support; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/DestructionAwareObjectPostProcessorTest.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/DestructionAwareObjectPostProcessorTest.cs index 7f7a727c..ca1c921f 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/DestructionAwareObjectPostProcessorTest.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/DestructionAwareObjectPostProcessorTest.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Context.Support; using Spring.Objects.Factory.Support; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/DictionaryFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/DictionaryFactoryObjectTests.cs index 5ebbafb1..bc1985fe 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/DictionaryFactoryObjectTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/DictionaryFactoryObjectTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using NUnit.Framework; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/EnvironmentVariableSourceTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/EnvironmentVariableSourceTests.cs index c7f06ba3..2685902a 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/EnvironmentVariableSourceTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/EnvironmentVariableSourceTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Objects.Factory.Config; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/EventValuesTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/EventValuesTests.cs index ed6f1f00..239b8d17 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/EventValuesTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/EventValuesTests.cs @@ -50,8 +50,6 @@ public class EventValuesTests internal class MyEventHandler : IEventHandlerValue { - #region IEventHandlerValue Members - private object _source = new object(); private string _eventName = "MyEvent"; private string _methodName = "MyEventHandlerMethod"; @@ -95,14 +93,10 @@ public class EventValuesTests public void Wire(object source, object handler) { } - - #endregion } internal class MyEventHandler2 : IEventHandlerValue { - #region IEventHandlerValue Members - private object _source = new object(); private string _eventName = "MyEvent"; private string _methodName = "MyEventHandlerMethod"; @@ -146,7 +140,5 @@ public class EventValuesTests public void Wire(object source, object handler) { } - - #endregion } } diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/FieldRetrievingFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/FieldRetrievingFactoryObjectTests.cs index 7ee073eb..8341ec30 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/FieldRetrievingFactoryObjectTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/FieldRetrievingFactoryObjectTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Objects.Factory.Config; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ListFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ListFactoryObjectTests.cs index 45899422..86eadb8a 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ListFactoryObjectTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ListFactoryObjectTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using NUnit.Framework; -#endregion - namespace Spring.Objects.Factory.Config; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/LogFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/LogFactoryObjectTests.cs index 983adfc6..533a7fdd 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/LogFactoryObjectTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/LogFactoryObjectTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Objects.Factory.Config; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/MethodInvokingFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/MethodInvokingFactoryObjectTests.cs index d578b6cb..797cc3aa 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/MethodInvokingFactoryObjectTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/MethodInvokingFactoryObjectTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using NUnit.Framework; using Spring.Core; using Spring.Objects.Support; -#endregion - namespace Spring.Objects.Factory.Config; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ObjectDefinitionVisitorTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ObjectDefinitionVisitorTests.cs index e8cfd664..37b583c2 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ObjectDefinitionVisitorTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ObjectDefinitionVisitorTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Collections.Specialized; using NUnit.Framework; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ObjectFactoryCreatingFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ObjectFactoryCreatingFactoryObjectTests.cs index a5ceaecd..892cbf18 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ObjectFactoryCreatingFactoryObjectTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ObjectFactoryCreatingFactoryObjectTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using FakeItEasy; using NUnit.Framework; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ObjectReferenceFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ObjectReferenceFactoryObjectTests.cs index 0967b296..28f87bfe 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ObjectReferenceFactoryObjectTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ObjectReferenceFactoryObjectTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using FakeItEasy; using NUnit.Framework; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyFileVariableSourceTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyFileVariableSourceTests.cs index d0fffcfc..6f716a1a 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyFileVariableSourceTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyFileVariableSourceTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region - using NUnit.Framework; using Spring.Core.IO; -#endregion - namespace Spring.Objects.Factory.Config; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyOverrideConfigurerTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyOverrideConfigurerTests.cs index aff3ef00..29e4d434 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyOverrideConfigurerTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyOverrideConfigurerTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections.Specialized; using FakeItEasy; using Microsoft.Extensions.Logging.Abstractions; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyPathFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyPathFactoryObjectTests.cs index 52fce295..f7794a2f 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyPathFactoryObjectTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyPathFactoryObjectTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using FakeItEasy; using NUnit.Framework; using Spring.Core; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyPlaceholderConfigurerTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyPlaceholderConfigurerTests.cs index 0d15df63..5fe0c1ea 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyPlaceholderConfigurerTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyPlaceholderConfigurerTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Collections.Specialized; using FakeItEasy; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyRetrievingFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyRetrievingFactoryObjectTests.cs index d51ca89a..12f722df 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyRetrievingFactoryObjectTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyRetrievingFactoryObjectTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Globalization; using NUnit.Framework; using Spring.Core; -#endregion - namespace Spring.Objects.Factory.Config; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/RegistryVariableSourceTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/RegistryVariableSourceTests.cs index 04cbdc1b..8677f5b0 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/RegistryVariableSourceTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/RegistryVariableSourceTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.Win32; using NUnit.Framework; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ResourceHandlerConfigurerTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ResourceHandlerConfigurerTests.cs index e786f232..4aa3c570 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ResourceHandlerConfigurerTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ResourceHandlerConfigurerTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using FakeItEasy; using NUnit.Framework; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ResourceManagerFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ResourceManagerFactoryObjectTests.cs index 54c842e1..13080ce3 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ResourceManagerFactoryObjectTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ResourceManagerFactoryObjectTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Resources; using NUnit.Framework; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/RuntimeObjectReferenceTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/RuntimeObjectReferenceTests.cs index 150c754e..2a4ac97d 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/RuntimeObjectReferenceTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/RuntimeObjectReferenceTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Objects.Factory.Config; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/SetFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/SetFactoryObjectTests.cs index 16300bf3..cf1c434d 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/SetFactoryObjectTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/SetFactoryObjectTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using Spring.Collections; using NUnit.Framework; -#endregion - namespace Spring.Objects.Factory.Config; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/SharedStateAwareProcessorTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/SharedStateAwareProcessorTests.cs index 3a1bcba8..29a54721 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/SharedStateAwareProcessorTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/SharedStateAwareProcessorTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using FakeItEasy; using NUnit.Framework; using Spring.Objects.Factory.Support; using Spring.Objects.Support; -#endregion - namespace Spring.Objects.Factory.Config; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/SpecialFolderVariableSourceTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/SpecialFolderVariableSourceTests.cs index 238b5ae8..26984998 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/SpecialFolderVariableSourceTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/SpecialFolderVariableSourceTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Objects.Factory.Config; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/TypeAliasConfigurerTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/TypeAliasConfigurerTests.cs index 8e576402..d721a9d3 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/TypeAliasConfigurerTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/TypeAliasConfigurerTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using FakeItEasy; using NUnit.Framework; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/TypedStringValueTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/TypedStringValueTests.cs index b352ac0b..ee1cb1da 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/TypedStringValueTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/TypedStringValueTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Util; -#endregion - namespace Spring.Objects.Factory.Config; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/VariableAccessorTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/VariableAccessorTests.cs index 740c67a6..3d351fe3 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/VariableAccessorTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/VariableAccessorTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Globalization; using NUnit.Framework; -#endregion - namespace Spring.Objects.Factory.Config; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/VariablePlaceholderConfigurerTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/VariablePlaceholderConfigurerTests.cs index 4321a3d0..4a95168e 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/VariablePlaceholderConfigurerTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/VariablePlaceholderConfigurerTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using FakeItEasy; using NUnit.Framework; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/DefaultListableObjectFactoryPerfTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/DefaultListableObjectFactoryPerfTests.cs index 18999ef7..e1de084e 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/DefaultListableObjectFactoryPerfTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/DefaultListableObjectFactoryPerfTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Diagnostics; using NUnit.Framework; using Spring.Objects.Factory.Config; using Spring.Objects.Factory.Support; using Spring.Threading; -#endregion - namespace Spring.Objects.Factory; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/DummyConfigurableFactory.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/DummyConfigurableFactory.cs index 6af437bb..d5b07078 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/DummyConfigurableFactory.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/DummyConfigurableFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Objects.Factory.Config; -#endregion - namespace Spring.Objects.Factory; /// @@ -33,19 +25,11 @@ namespace Spring.Objects.Factory; /// Bruno Baia public class DummyConfigurableFactory : DummyFactory, IConfigurableFactoryObject { - #region Fields - private IObjectDefinition productTemplate; - #endregion - - #region IConfigurableFactoryObject Members - public IObjectDefinition ProductTemplate { get { return productTemplate; } set { productTemplate = value; } } - - #endregion } diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/DummyFactory.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/DummyFactory.cs index 75b95c60..7f518a9e 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/DummyFactory.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/DummyFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Objects.Factory.Config; -#endregion - namespace Spring.Objects.Factory; /// @@ -42,14 +34,8 @@ public class DummyFactory : IInitializingObject, IDisposable { - #region Constants - public const string SINGLETON_NAME = "Factory singleton"; - #endregion - - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// class. @@ -61,10 +47,6 @@ public class DummyFactory : testObject.Age = 25; } - #endregion - - #region Properties - /// /// Was this initialized by invocation of the /// AfterPropertiesSet() method from the IInitializingObject interface? @@ -93,10 +75,6 @@ public class DummyFactory : set { otherTestObject = value; } } - #endregion - - #region Methods - /// /// Clear static state. /// @@ -105,10 +83,6 @@ public class DummyFactory : prototypeCreated = false; } - #endregion - - #region Fields - /// Default is for factories to return a singleton instance. private bool singleton = true; @@ -120,10 +94,6 @@ public class DummyFactory : private TestObject testObject; private ITestObject otherTestObject; - #endregion - - #region IFactoryObject Members - public Type ObjectType { get @@ -166,10 +136,6 @@ public class DummyFactory : set { singleton = value; } } - #endregion - - #region IObjectFactoryAware Members - public IObjectFactory ObjectFactory { get { return objectFactory; } @@ -180,20 +146,12 @@ public class DummyFactory : } } - #endregion - - #region IObjectNameAware Members - public string ObjectName { get { return objectName; } set { objectName = value; } } - #endregion - - #region IInitializingObject Members - public void AfterPropertiesSet() { if (initialized) @@ -205,10 +163,6 @@ public class DummyFactory : initialized = true; } - #endregion - - #region IDisposable Members - public void Dispose() { if (testObject != null) @@ -216,6 +170,4 @@ public class DummyFactory : testObject.Name = null; } } - - #endregion } diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/HasMap.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/HasMap.cs index a8e41da1..74c26f02 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/HasMap.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/HasMap.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Collections.Specialized; using Spring.Collections; -#endregion - namespace Spring.Objects.Factory; /// @@ -33,8 +25,6 @@ namespace Spring.Objects.Factory; /// public class HasMap { - #region Properties - public IDictionary Map { get @@ -107,16 +97,10 @@ public class HasMap } } - #endregion - - #region Fields - private IDictionary _map; private Set _set; private NameValueCollection _props; private object[] _objectArray; private Type[] _classArray; private int[] _intArray; - - #endregion } diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/ISideEffectObject.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/ISideEffectObject.cs index 15d6ac7b..1f440f60 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/ISideEffectObject.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/ISideEffectObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory; public interface ISideEffectObject diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/KnowsIfInstantiated.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/KnowsIfInstantiated.cs index 3a36cd73..4862c571 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/KnowsIfInstantiated.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/KnowsIfInstantiated.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory; internal sealed class KnowsIfInstantiated diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/LifecycleObject.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/LifecycleObject.cs index 6952cc70..97ba9b49 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/LifecycleObject.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/LifecycleObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Objects.Factory.Config; -#endregion - namespace Spring.Objects.Factory; /// @@ -37,8 +29,6 @@ public class LifecycleObject : IObjectFactoryAware, IDisposable { - #region Methods - public virtual void PostProcessBeforeInit() { if (inited) @@ -81,10 +71,6 @@ public class LifecycleObject : postProcessedAfterInit = true; } - #endregion - - #region Properties - public bool Destroyed { get @@ -97,10 +83,6 @@ public class LifecycleObject : } } - #endregion - - #region Fields - private string objectName; private IObjectFactory owningFactory; private bool postProcessedBeforeInit; @@ -108,10 +90,6 @@ public class LifecycleObject : private bool postProcessedAfterInit; private bool destroyed; - #endregion - - #region IObjectNameAware Members - public string ObjectName { get @@ -124,10 +102,6 @@ public class LifecycleObject : } } - #endregion - - #region IInitializingObject Members - public void AfterPropertiesSet() { if (owningFactory == null) @@ -148,10 +122,6 @@ public class LifecycleObject : inited = true; } - #endregion - - #region IObjectFactoryAware Members - public IObjectFactory ObjectFactory { get @@ -164,10 +134,6 @@ public class LifecycleObject : } } - #endregion - - #region IDisposable Members - public void Dispose() { if (destroyed) @@ -178,10 +144,6 @@ public class LifecycleObject : destroyed = true; } - #endregion - - #region Inner Class : PostProcessor - public class PostProcessor : IObjectPostProcessor, IObjectFactoryAware { public object PostProcessBeforeInitialization(object obj, string name) @@ -212,6 +174,4 @@ public class LifecycleObject : get { return objectFactory; } } } - - #endregion } diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/MethodReplacerTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/MethodReplacerTests.cs index e0ecb4e4..4fea0e4b 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/MethodReplacerTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/MethodReplacerTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; using Spring.Objects.Factory.Support; -#endregion - namespace Spring.Objects.Factory; /// @@ -346,8 +338,6 @@ public sealed class MethodReplacerTests Assert.IsFalse(ReferenceEquals(feed1, feed2)); } - #region Rainy Day Scenarios - [Test] public void FailWithLookupMethodOnSealedClass() { @@ -436,8 +426,6 @@ public sealed class MethodReplacerTests factory.RegisterObjectDefinition("feed", feedDef); Assert.Throws(() => factory.GetObject("manager")); } - - #endregion } public interface INewsFeedManager diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/MustBeInitialized.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/MustBeInitialized.cs index c9e4799d..e29f529e 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/MustBeInitialized.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/MustBeInitialized.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Objects.Factory; /// @@ -31,17 +23,11 @@ namespace Spring.Objects.Factory; /// Rick Evans (.NET) public class MustBeInitialized : IInitializingObject { - #region Constructor (s) / Destructor - /// /// Creates a new instance of the class. /// public MustBeInitialized() { } - #endregion - - #region Methods - public void AfterPropertiesSet() { inited = true; @@ -60,11 +46,5 @@ public class MustBeInitialized : IInitializingObject } } - #endregion - - #region Fields - private bool inited; - - #endregion } diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/NoSuchObjectDefinitionExceptionTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/NoSuchObjectDefinitionExceptionTests.cs index 66cc6c57..d7819614 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/NoSuchObjectDefinitionExceptionTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/NoSuchObjectDefinitionExceptionTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization.Formatters.Binary; using NUnit.Framework; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/ObjectDefinitionStoreExceptionTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/ObjectDefinitionStoreExceptionTests.cs index e8b017b5..fbad6dd1 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/ObjectDefinitionStoreExceptionTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/ObjectDefinitionStoreExceptionTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using FakeItEasy; using NUnit.Framework; using Spring.Core.IO; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/ObjectFactoryUtilsTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/ObjectFactoryUtilsTests.cs index e5fb48b7..bf2654b1 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/ObjectFactoryUtilsTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/ObjectFactoryUtilsTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using NUnit.Framework; using Spring.Objects.Factory.Config; using Spring.Objects.Factory.Support; using Spring.Objects.Factory.Xml; -#endregion - namespace Spring.Objects.Factory; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/SideEffectObject.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/SideEffectObject.cs index e706e4a1..abb98573 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/SideEffectObject.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/SideEffectObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/AutowireUtilsTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/AutowireUtilsTests.cs index 90351619..0f0b7e0c 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/AutowireUtilsTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/AutowireUtilsTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; using Spring.Util; -#endregion - namespace Spring.Objects.Factory.Support; /// @@ -35,8 +27,6 @@ namespace Spring.Objects.Factory.Support; [TestFixture] public sealed class AutowireUtilsTests { - #region GetTypeDifferenceWeight Tests - [Test] public void GetTypeDifferenceWeightForZeroArgCtor() { @@ -166,10 +156,6 @@ public sealed class AutowireUtilsTests Assert.AreEqual(expectedWeight, actualWeight, "AutowireUtils.GetTypeDifferenceWeight() was wrong, evidently."); } - #endregion - - #region SortConstructors Tests - [Test] public void SortCtorsReallyIsGreedy() { @@ -198,10 +184,6 @@ public sealed class AutowireUtilsTests AutowireUtils.SortConstructors(null); } - #endregion - - #region Inner Class used to test ctor sorting - private class Fool { private string _name; @@ -238,10 +220,6 @@ public sealed class AutowireUtilsTests } } - #endregion - - #region Inner Classes (deep inheritance chain) used to test type weighting - private sealed class Fable { public Fable() @@ -272,6 +250,4 @@ public sealed class AutowireUtilsTests private sealed class EnglishCharacter : NurseryRhymeCharacter { } - - #endregion } diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ChildObjectDefinitionTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ChildObjectDefinitionTests.cs index 4421edc0..eddc293a 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ChildObjectDefinitionTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ChildObjectDefinitionTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Objects.Factory.Support; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/DefaultObjectDefinitionFactoryTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/DefaultObjectDefinitionFactoryTests.cs index 8600c700..7616370d 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/DefaultObjectDefinitionFactoryTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/DefaultObjectDefinitionFactoryTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Objects.Factory.Support; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/DelegatingMethodReplacerTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/DelegatingMethodReplacerTests.cs index 87a3bf66..74b918d9 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/DelegatingMethodReplacerTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/DelegatingMethodReplacerTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using FakeItEasy; using NUnit.Framework; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/LookupMethodOverrideTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/LookupMethodOverrideTests.cs index 9da5f711..50dcd6b1 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/LookupMethodOverrideTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/LookupMethodOverrideTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Objects.Factory.Support; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/LookupMethodReplacerTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/LookupMethodReplacerTests.cs index 62198cb6..ab012100 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/LookupMethodReplacerTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/LookupMethodReplacerTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using FakeItEasy; using NUnit.Framework; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ManagedDictionaryTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ManagedDictionaryTests.cs index a749eff4..e9ebc35c 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ManagedDictionaryTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ManagedDictionaryTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using NUnit.Framework; using Spring.Objects.Factory.Config; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ManagedListTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ManagedListTests.cs index 71a925f1..eac48cc0 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ManagedListTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ManagedListTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using NUnit.Framework; using Spring.Objects.Factory.Config; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ManagedNameValueCollectionTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ManagedNameValueCollectionTests.cs index 222ea999..996f49a8 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ManagedNameValueCollectionTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ManagedNameValueCollectionTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections.Specialized; using NUnit.Framework; using Spring.Objects.Factory.Config; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ManagedSetTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ManagedSetTests.cs index 4f6b7674..9fd024dd 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ManagedSetTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ManagedSetTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Collections; using Spring.Objects.Factory.Config; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ObjectDefinitionBuilderTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ObjectDefinitionBuilderTests.cs index ef98424c..94dbf3c6 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ObjectDefinitionBuilderTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ObjectDefinitionBuilderTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using NUnit.Framework; using Spring.Context.Support; using Spring.Objects.Factory.Xml; -#endregion - namespace Spring.Objects.Factory.Support; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ObjectDefinitionReaderUtilsTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ObjectDefinitionReaderUtilsTests.cs index 2c6dadd6..67b45ec8 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ObjectDefinitionReaderUtilsTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ObjectDefinitionReaderUtilsTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using FakeItEasy; using NUnit.Framework; using Spring.Objects.Factory.Config; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ReplacedMethodOverrideTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ReplacedMethodOverrideTests.cs index 1cd5ba43..871449e8 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ReplacedMethodOverrideTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ReplacedMethodOverrideTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Objects.Factory.Support; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/RootObjectDefinitionTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/RootObjectDefinitionTests.cs index d02181d6..e6db6184 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/RootObjectDefinitionTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/RootObjectDefinitionTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Objects.Support; using Spring.Objects.Factory.Config; using NUnit.Framework; -#endregion - namespace Spring.Objects.Factory.Support; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/SimpleInstantiationStrategyTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/SimpleInstantiationStrategyTests.cs index df147de1..6a0457b9 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/SimpleInstantiationStrategyTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/SimpleInstantiationStrategyTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Objects.Factory.Config; -#endregion - namespace Spring.Objects.Factory.Support; /// @@ -34,8 +26,6 @@ namespace Spring.Objects.Factory.Support; [TestFixture] public sealed class SimpleInstantiationStrategyTests { - #region SetUp - /// /// The setup logic executed before the execution of each individual test. /// @@ -54,8 +44,6 @@ public sealed class SimpleInstantiationStrategyTests _factory = myFactory; } - #endregion - [Test] public void InstantiateWithNulls() { diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/UnsupportedObjectDefinitionImplementation.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/UnsupportedObjectDefinitionImplementation.cs index a51cf4cf..353d8454 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/UnsupportedObjectDefinitionImplementation.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/UnsupportedObjectDefinitionImplementation.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects.Factory.Config; using Spring.Objects.Factory.Support; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/ArrayCtorDependencyObject.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/ArrayCtorDependencyObject.cs index a1f0e29e..b43fc6a0 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/ArrayCtorDependencyObject.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/ArrayCtorDependencyObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory.Xml; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/CollectionConversionGenericTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/CollectionConversionGenericTests.cs index 4dfb62ee..98fcc942 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/CollectionConversionGenericTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/CollectionConversionGenericTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Objects.Factory.Support; using System.Collections; using Spring.Core.TypeConversion; using System.Collections.Specialized; -#endregion - namespace Spring.Objects.Factory.Xml; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/CollectionMergingGenericTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/CollectionMergingGenericTests.cs index 1b71813f..8135d852 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/CollectionMergingGenericTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/CollectionMergingGenericTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Objects.Factory.Support; -#endregion - namespace Spring.Objects.Factory.Xml; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/CollectionMergingTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/CollectionMergingTests.cs index 0c083a9f..0c128feb 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/CollectionMergingTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/CollectionMergingTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Collections.Specialized; using NUnit.Framework; using Spring.Collections; using Spring.Objects.Factory.Support; -#endregion - namespace Spring.Objects.Factory.Xml; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/ConstructorDependenciesObject.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/ConstructorDependenciesObject.cs index 2d1b50de..b1529c2c 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/ConstructorDependenciesObject.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/ConstructorDependenciesObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Objects.Factory.Xml; /// @@ -31,8 +23,6 @@ namespace Spring.Objects.Factory.Xml; /// Rick Evans (.NET) public class ConstructorDependenciesObject { - #region Constructor (s) / Destructor - public ConstructorDependenciesObject(int age) { this.age = age; @@ -61,10 +51,6 @@ public class ConstructorDependenciesObject this.other = other; } - #endregion - - #region Properties - public int Age { get { return age; } @@ -93,15 +79,9 @@ public class ConstructorDependenciesObject get { return other; } } - #endregion - - #region Fields - private int age; private string name; private ITestObject spouse1; private ITestObject spouse2; private IndexedTestObject other; - - #endregion } \ No newline at end of file diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DependenciesObject.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DependenciesObject.cs index 43ea85db..e856e5e0 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DependenciesObject.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DependenciesObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Objects.Factory.Xml; /// @@ -31,8 +23,6 @@ namespace Spring.Objects.Factory.Xml; /// Rick Evans (.NET) public class DependenciesObject { - #region Constructor (s) / Destructor - /// /// Creates a new instance of the DependenciesObject class. /// @@ -40,10 +30,6 @@ public class DependenciesObject { } - #endregion - - #region Properties - public int Age { get { return age; } @@ -62,13 +48,7 @@ public class DependenciesObject set { this.spouse = value; } } - #endregion - - #region Fields - private int age; private string name; private ITestObject spouse; - - #endregion } diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DerivedConstructorDependenciesObject.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DerivedConstructorDependenciesObject.cs index 8e0e6db7..b036fb4d 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DerivedConstructorDependenciesObject.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DerivedConstructorDependenciesObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Objects.Factory.Xml; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DoubleBooleanConstructorObject.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DoubleBooleanConstructorObject.cs index 912d69aa..cc36961d 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DoubleBooleanConstructorObject.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DoubleBooleanConstructorObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory.Xml; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DummyBo.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DummyBo.cs index a7f7f1cf..082edadb 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DummyBo.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DummyBo.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Objects.Factory.Xml; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DummyDao.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DummyDao.cs index b3078c7e..307fae27 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DummyDao.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DummyDao.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Objects.Factory.Xml; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DummyReferencer.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DummyReferencer.cs index 1c26550e..efb81219 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DummyReferencer.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DummyReferencer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Objects.Factory.Xml; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/EventWiringTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/EventWiringTests.cs index f63491cf..f692705e 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/EventWiringTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/EventWiringTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Objects.Factory.Support; -#endregion - namespace Spring.Objects.Factory.Xml; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/FactoryMethods.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/FactoryMethods.cs index bdcdea8a..b8ddee98 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/FactoryMethods.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/FactoryMethods.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Objects.Factory.Xml; /// @@ -32,8 +24,6 @@ namespace Spring.Objects.Factory.Xml; /// Rick Evans (.NET) public class FactoryMethods { - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// class. @@ -50,10 +40,6 @@ public class FactoryMethods _number = number; } - #endregion - - #region Properties - public TestObject Object { get { return _object; } @@ -76,10 +62,6 @@ public class FactoryMethods get { return _number; } } - #endregion - - #region Methods - public static FactoryMethods DefaultInstance() { TestObject obj = new TestObject(); @@ -97,14 +79,8 @@ public class FactoryMethods return new FactoryMethods(obj, name, num); } - #endregion - - #region Fields - private int _number; private TestObject _object; private string _name = "default"; private string _value; - - #endregion } diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/IDummyBo.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/IDummyBo.cs index c9810c76..db56657c 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/IDummyBo.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/IDummyBo.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Objects.Factory.Xml; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/InstanceFactory.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/InstanceFactory.cs index a42f0eff..3a78ce88 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/InstanceFactory.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/InstanceFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Data; -#endregion - namespace Spring.Objects.Factory.Xml; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/LocaleTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/LocaleTests.cs index fd03fc2a..5fac0a3b 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/LocaleTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/LocaleTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Globalization; using NUnit.Framework; using Spring.Core.IO; -#endregion - namespace Spring.Objects.Factory.Xml; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/MixedCollectionObject.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/MixedCollectionObject.cs index 108a6a29..c7e1f5af 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/MixedCollectionObject.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/MixedCollectionObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; -#endregion - namespace Spring.Objects.Factory.Xml; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/NamespaceParserRegistryTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/NamespaceParserRegistryTests.cs index 179e6b56..fc3e6f54 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/NamespaceParserRegistryTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/NamespaceParserRegistryTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Xml; using NUnit.Framework; using Spring.Core.IO; using Spring.Objects.Factory.Config; using Spring.Util; -#endregion - namespace Spring.Objects.Factory.Xml; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/NullAppender.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/NullAppender.cs index ab2a66ce..0702007b 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/NullAppender.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/NullAppender.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Objects.Factory.Xml; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/ObjectFactorySectionHandlerTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/ObjectFactorySectionHandlerTests.cs index d5ee32c1..e7b2db9c 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/ObjectFactorySectionHandlerTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/ObjectFactorySectionHandlerTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Xml; using NUnit.Framework; -#endregion - namespace Spring.Objects.Factory.Xml; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/ObjectNameGenerationTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/ObjectNameGenerationTests.cs index 62c780f4..b8842cca 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/ObjectNameGenerationTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/ObjectNameGenerationTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Objects.Factory.Support; -#endregion - namespace Spring.Objects.Factory.Xml; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/ReadOnlyXmlTestResource.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/ReadOnlyXmlTestResource.cs index c232ed7f..5230aa66 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/ReadOnlyXmlTestResource.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/ReadOnlyXmlTestResource.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Text; using Spring.Core.IO; -#endregion - namespace Spring.Objects.Factory.Xml; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/SiimpleCtorWiringTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/SiimpleCtorWiringTests.cs index 1d831686..fff5f771 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/SiimpleCtorWiringTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/SiimpleCtorWiringTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Objects.Factory.Xml; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/SingleSimpleTypeConstructorObject.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/SingleSimpleTypeConstructorObject.cs index 816b3f74..b1aa2f2b 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/SingleSimpleTypeConstructorObject.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/SingleSimpleTypeConstructorObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects.Factory.Xml; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/TestObjectCreator.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/TestObjectCreator.cs index 1e9313c1..a2db1e74 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/TestObjectCreator.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/TestObjectCreator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Objects.Factory.Xml; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlListableObjectFactoryTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlListableObjectFactoryTests.cs index 57ef6056..a9c6627c 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlListableObjectFactoryTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlListableObjectFactoryTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Objects.Factory.Config; using Spring.Objects.Factory.Support; -#endregion - namespace Spring.Objects.Factory.Xml { /// @@ -36,8 +28,6 @@ namespace Spring.Objects.Factory.Xml [TestFixture] public class XmlListableObjectFactoryTests : AbstractListableObjectFactoryTests { - #region Inner Class : AnonymousClassObjectPostProcessor - private class AnonymousClassObjectPostProcessor : IObjectPostProcessor { public AnonymousClassObjectPostProcessor() @@ -67,8 +57,6 @@ namespace Spring.Objects.Factory.Xml } } - #endregion - protected internal override AbstractObjectFactory CreateObjectFactory(bool caseSensitive) { return new DefaultListableObjectFactory(caseSensitive); @@ -77,8 +65,6 @@ namespace Spring.Objects.Factory.Xml private DefaultListableObjectFactory parent; // private XmlObjectFactory factory; - #region Test SetUp - [SetUp] protected void SetUp() { @@ -110,8 +96,6 @@ namespace Spring.Objects.Factory.Xml base.ObjectFactory = factory; } - #endregion - [Test] public virtual void FactoryNesting() { diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectCollectionTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectCollectionTests.cs index 27679cfc..9f44a23b 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectCollectionTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectCollectionTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Text; using Microsoft.Extensions.Logging.Abstractions; @@ -733,8 +729,6 @@ public sealed class XmlObjectCollectionTests } } -#region Helper classes - public class NonGenericExpressionHolder { private IList expressionsList; @@ -785,6 +779,4 @@ public class GenericExpressionHolder { get { return this.expressionsDictionary[key]; } } -} - -#endregion +} \ No newline at end of file diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectDefinitionReaderTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectDefinitionReaderTests.cs index 9e16e8a1..6353ee65 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectDefinitionReaderTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectDefinitionReaderTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using System.Xml; using NUnit.Framework; @@ -28,8 +22,6 @@ using Spring.Core.IO; using Spring.Objects.Factory.Config; using Spring.Objects.Factory.Support; -#endregion - namespace Spring.Objects.Factory.Xml; /// @@ -245,8 +237,6 @@ public class XmlObjectDefinitionReaderTests } } - #region ThrowsObjectDefinitionStoreExceptionOnErrorDuringObjectDefinitionRegistration Helper - private class TestXmlObjectDefinitionReader : XmlObjectDefinitionReader { public TestXmlObjectDefinitionReader(IObjectDefinitionRegistry registry) @@ -268,8 +258,6 @@ public class XmlObjectDefinitionReaderTests } } - #endregion - [Test] public void ThrowsObjectDefinitionStoreExceptionOnErrorDuringObjectDefinitionRegistration() { diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlParserResolverTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlParserResolverTests.cs index ebb9413d..14fd7921 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlParserResolverTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlParserResolverTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Xml; using NUnit.Framework; using Spring.Objects.Factory.Config; -#endregion - namespace Spring.Objects.Factory.Xml; /// @@ -60,12 +52,8 @@ public sealed class XmlParserResolverTests Assert.Throws(() => NamespaceParserRegistry.RegisterParser(typeof(NotImplementedXmlObjectDefinitionParser), string.Empty, null)); } - #region Inner Class : NotImplementedXmlObjectDefinitionParser - private sealed class NotImplementedXmlObjectDefinitionParser : INamespaceParser { - #region IXmlObjectDefinitionParser Members - /// /// Invoked by after construction but before any /// elements have been parsed. @@ -75,8 +63,6 @@ public sealed class XmlParserResolverTests throw new NotImplementedException(); } - #endregion - public IObjectDefinition ParseElement(XmlElement element, ParserContext parserContext) { throw new NotImplementedException(); @@ -88,6 +74,4 @@ public sealed class XmlParserResolverTests throw new NotImplementedException(); } } - - #endregion } diff --git a/test/Spring/Spring.Core.Tests/Objects/INestedTestObject.cs b/test/Spring/Spring.Core.Tests/Objects/INestedTestObject.cs index 6702e6e3..6c70060c 100644 --- a/test/Spring/Spring.Core.Tests/Objects/INestedTestObject.cs +++ b/test/Spring/Spring.Core.Tests/Objects/INestedTestObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects; public interface INestedTestObject diff --git a/test/Spring/Spring.Core.Tests/Objects/IOther.cs b/test/Spring/Spring.Core.Tests/Objects/IOther.cs index edc8f396..5ae7e11d 100644 --- a/test/Spring/Spring.Core.Tests/Objects/IOther.cs +++ b/test/Spring/Spring.Core.Tests/Objects/IOther.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Objects; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/IPerson.cs b/test/Spring/Spring.Core.Tests/Objects/IPerson.cs index 2804a009..22d04d45 100644 --- a/test/Spring/Spring.Core.Tests/Objects/IPerson.cs +++ b/test/Spring/Spring.Core.Tests/Objects/IPerson.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/ITestObject.cs b/test/Spring/Spring.Core.Tests/Objects/ITestObject.cs index 8df8f5cc..df058f10 100644 --- a/test/Spring/Spring.Core.Tests/Objects/ITestObject.cs +++ b/test/Spring/Spring.Core.Tests/Objects/ITestObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; namespace Spring.Objects; diff --git a/test/Spring/Spring.Core.Tests/Objects/IndexedTestObject.cs b/test/Spring/Spring.Core.Tests/Objects/IndexedTestObject.cs index fc5aca6c..3e361eae 100644 --- a/test/Spring/Spring.Core.Tests/Objects/IndexedTestObject.cs +++ b/test/Spring/Spring.Core.Tests/Objects/IndexedTestObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using Spring.Collections; -#endregion - namespace Spring.Objects; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/LazyTestObject.cs b/test/Spring/Spring.Core.Tests/Objects/LazyTestObject.cs index 84714b73..5602245d 100644 --- a/test/Spring/Spring.Core.Tests/Objects/LazyTestObject.cs +++ b/test/Spring/Spring.Core.Tests/Objects/LazyTestObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Objects; /// @@ -32,14 +24,8 @@ namespace Spring.Objects; /// Mark Pollack (.NET) public class LazyTestObject { - #region Fields - private static int count = 0; - #endregion - - #region Constructor (s) - /// /// Initializes a new instance of the class /// and sleeps for 2 seconds. @@ -50,24 +36,14 @@ public class LazyTestObject Thread.Sleep(2000); } - #endregion - - #region Properties - public static int Count { get { return count; } set { count = value; } } - #endregion - - #region Methods - public override string ToString() { return String.Format("LazyTestObject, Count = [{0}]", count); } - - #endregion } diff --git a/test/Spring/Spring.Core.Tests/Objects/MutablePropertyValuesTests.cs b/test/Spring/Spring.Core.Tests/Objects/MutablePropertyValuesTests.cs index b63ffbfb..040af970 100644 --- a/test/Spring/Spring.Core.Tests/Objects/MutablePropertyValuesTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/MutablePropertyValuesTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Objects; /// @@ -33,8 +25,6 @@ namespace Spring.Objects; [TestFixture] public sealed class MutablePropertyValuesTests { - #region SetUp - /// /// The setup logic executed before the execution of this test fixture. /// @@ -47,10 +37,6 @@ public sealed class MutablePropertyValuesTests [SetUp] public void SetUp() { } - #endregion - - #region TearDown - /// /// The tear down logic executed after the execution of each individual test. /// @@ -63,8 +49,6 @@ public sealed class MutablePropertyValuesTests [OneTimeTearDown] public void FixtureTearDown() { } - #endregion - [Test] public void Instantiation() { diff --git a/test/Spring/Spring.Core.Tests/Objects/NestedTestObject.cs b/test/Spring/Spring.Core.Tests/Objects/NestedTestObject.cs index 89248c74..2793691a 100644 --- a/test/Spring/Spring.Core.Tests/Objects/NestedTestObject.cs +++ b/test/Spring/Spring.Core.Tests/Objects/NestedTestObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.ComponentModel; using System.ComponentModel.Design.Serialization; using System.Globalization; -#endregion - namespace Spring.Objects; /// @@ -76,8 +68,6 @@ public class NestedTestObject : INestedTestObject } } -#region Inner Class : NestedTestObjectConverter - public class NestedTestObjectConverter : TypeConverter { public override bool CanConvertTo( @@ -121,6 +111,4 @@ public class NestedTestObjectConverter : TypeConverter { return base.ConvertTo(context, culture, param, destinationType); } -} - -#endregion +} \ No newline at end of file diff --git a/test/Spring/Spring.Core.Tests/Objects/NotWritablePropertyExceptionTests.cs b/test/Spring/Spring.Core.Tests/Objects/NotWritablePropertyExceptionTests.cs index da11073f..f848b541 100644 --- a/test/Spring/Spring.Core.Tests/Objects/NotWritablePropertyExceptionTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/NotWritablePropertyExceptionTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Core; diff --git a/test/Spring/Spring.Core.Tests/Objects/NumberTestObject.cs b/test/Spring/Spring.Core.Tests/Objects/NumberTestObject.cs index b5890587..a78113cb 100644 --- a/test/Spring/Spring.Core.Tests/Objects/NumberTestObject.cs +++ b/test/Spring/Spring.Core.Tests/Objects/NumberTestObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Objects; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/ObjectWrapperTests.cs b/test/Spring/Spring.Core.Tests/Objects/ObjectWrapperTests.cs index 45c9dd52..a7bf9888 100644 --- a/test/Spring/Spring.Core.Tests/Objects/ObjectWrapperTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/ObjectWrapperTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Collections.Specialized; using System.ComponentModel; @@ -34,8 +28,6 @@ using Spring.Core.TypeConversion; using Spring.Objects.Factory; using Spring.Util; -#endregion - namespace Spring.Objects; /// @@ -57,8 +49,6 @@ public sealed class ObjectWrapperTests LogManager.LoggerFactory = NullLoggerFactory.Instance; } - #region Classes Used During Tests - public class Person { private IList favoriteNames = new ArrayList(); @@ -424,10 +414,6 @@ public sealed class ObjectWrapperTests public int[] intArray; } - #endregion - - #region Methods - /// /// Factory method for getting an ObjectWrapper instance. /// @@ -451,8 +437,6 @@ public sealed class ObjectWrapperTests return new ObjectWrapper(objectToBeWrapped); } - #endregion - [Test] public void SetPropertyUsingValueThatNeedsConversionWithNoCustomConverterRegistered() { @@ -1050,8 +1034,6 @@ public sealed class ObjectWrapperTests pt.stringArray[3].Equals("fum"), "in correct values of string array"); } - #region Test for DateTime Properties - internal class DateTimeTestObject { private DateTime _dt; @@ -1074,10 +1056,6 @@ public sealed class ObjectWrapperTests Assert.AreEqual(1991, ((DateTime) wrapper.GetPropertyValue("TriggerDateTime")).Year); } - #endregion - - #region Test for CultureInfo Properties - internal class CultureTestObject { private CultureInfo _ci; @@ -1101,10 +1079,6 @@ public sealed class ObjectWrapperTests ((CultureInfo) wrapper.GetPropertyValue("Cult")).Name); } - #endregion - - #region Tests for URI Properties - internal class URITestObject { private Uri _uri; @@ -1127,10 +1101,6 @@ public sealed class ObjectWrapperTests ((Uri) wrapper.GetPropertyValue("ResourceIdentifier")).Host); } - #endregion - - #region Tests for Indexed Array Properties - [Test] public void GetIndexedFromArrayProperty() { @@ -1192,10 +1162,6 @@ public sealed class ObjectWrapperTests Assert.Throws(() => wrapper.GetPropertyValue("Array[]")); } - #endregion - - #region Tests for Indexed List Properties - internal class ListTestObject { private IList _list; @@ -1313,10 +1279,6 @@ public sealed class ObjectWrapperTests Assert.Throws(() => wrapper.GetPropertyValue("List[]")); } - #endregion - - #region Tests for Indexed Dictionary Properties - internal class DictionaryTestObject { private IDictionary _dictionary; @@ -1370,10 +1332,6 @@ public sealed class ObjectWrapperTests Assert.AreEqual(3, to.PeriodicTable.Count); } - #endregion - - #region Tests for Indexed Set Properties - internal class SetTestObject { private ISet _set; @@ -1442,10 +1400,6 @@ public sealed class ObjectWrapperTests Assert.Throws(() => wrapper.GetPropertyValue("Set[]")); } - #endregion - - #region Test for Enumeration Properties - internal class EnumTestObject { private FileMode FileModeEnum; @@ -1466,8 +1420,6 @@ public sealed class ObjectWrapperTests Assert.AreEqual(FileMode.Create, (FileMode) wrapper.GetPropertyValue("FileMode")); } - #endregion - [Test] public void SetTypePropertyWithString() { diff --git a/test/Spring/Spring.Core.Tests/Objects/PropertyAccessExceptionsExceptionTests.cs b/test/Spring/Spring.Core.Tests/Objects/PropertyAccessExceptionsExceptionTests.cs index 2f2d862c..d51d2c9f 100644 --- a/test/Spring/Spring.Core.Tests/Objects/PropertyAccessExceptionsExceptionTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/PropertyAccessExceptionsExceptionTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Reflection; using NUnit.Framework; diff --git a/test/Spring/Spring.Core.Tests/Objects/PropertyValueTests.cs b/test/Spring/Spring.Core.Tests/Objects/PropertyValueTests.cs index 8a4b7082..987d2060 100644 --- a/test/Spring/Spring.Core.Tests/Objects/PropertyValueTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/PropertyValueTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Objects; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/ResourceTestObject.cs b/test/Spring/Spring.Core.Tests/Objects/ResourceTestObject.cs index 646f9076..dcc8e29d 100644 --- a/test/Spring/Spring.Core.Tests/Objects/ResourceTestObject.cs +++ b/test/Spring/Spring.Core.Tests/Objects/ResourceTestObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Core.IO; -#endregion - namespace Spring.Objects; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/SerializablePerson.cs b/test/Spring/Spring.Core.Tests/Objects/SerializablePerson.cs index d109973b..c20bfc07 100644 --- a/test/Spring/Spring.Core.Tests/Objects/SerializablePerson.cs +++ b/test/Spring/Spring.Core.Tests/Objects/SerializablePerson.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Runtime.Serialization; -#endregion - namespace Spring.Objects; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/StaticTestEventHandler.cs b/test/Spring/Spring.Core.Tests/Objects/StaticTestEventHandler.cs index ea197cc1..f22aa79b 100644 --- a/test/Spring/Spring.Core.Tests/Objects/StaticTestEventHandler.cs +++ b/test/Spring/Spring.Core.Tests/Objects/StaticTestEventHandler.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Objects; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Support/AbstractSharedStateFactoryTests.cs b/test/Spring/Spring.Core.Tests/Objects/Support/AbstractSharedStateFactoryTests.cs index 0526ab0f..2b93f86d 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Support/AbstractSharedStateFactoryTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Support/AbstractSharedStateFactoryTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using NUnit.Framework; -#endregion - namespace Spring.Objects.Support; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Support/ArgumentConvertingMethodInvokerTests.cs b/test/Spring/Spring.Core.Tests/Objects/Support/ArgumentConvertingMethodInvokerTests.cs index afec0a5c..b1b0b5bd 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Support/ArgumentConvertingMethodInvokerTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Support/ArgumentConvertingMethodInvokerTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Objects.Support; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Support/AutoWiringEventHandlerValueTests.cs b/test/Spring/Spring.Core.Tests/Objects/Support/AutoWiringEventHandlerValueTests.cs index 39cfc1a7..a3c4bffc 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Support/AutoWiringEventHandlerValueTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Support/AutoWiringEventHandlerValueTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Objects.Support; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Support/ByTypeSharedStateProviderTests.cs b/test/Spring/Spring.Core.Tests/Objects/Support/ByTypeSharedStateProviderTests.cs index f2f2918b..2dc2011b 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Support/ByTypeSharedStateProviderTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Support/ByTypeSharedStateProviderTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Objects.Support; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Support/InstanceEventHandlerValueTests.cs b/test/Spring/Spring.Core.Tests/Objects/Support/InstanceEventHandlerValueTests.cs index 1f5a1c5c..c7b44048 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Support/InstanceEventHandlerValueTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Support/InstanceEventHandlerValueTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Objects.Support; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Support/MethodInvokerTests.cs b/test/Spring/Spring.Core.Tests/Objects/Support/MethodInvokerTests.cs index dba238c8..14ffb6b2 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Support/MethodInvokerTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Support/MethodInvokerTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Core; -#endregion - namespace Spring.Objects.Support; /// @@ -243,8 +235,6 @@ public sealed class MethodInvokerTests "PreparedArguments should revert to the empty object[] when set to null; must NEVER be null."); } - #region Inner Class : Foo - private sealed class Foo { public Foo() @@ -298,10 +288,6 @@ public sealed class MethodInvokerTests } } - #endregion - - #region Inner Class : MyMethodInvoker - private sealed class MyMethodInvoker : MethodInvoker { public MyMethodInvoker() @@ -318,6 +304,4 @@ public sealed class MethodInvokerTests return PreparedArguments; } } - - #endregion } diff --git a/test/Spring/Spring.Core.Tests/Objects/Support/MutableSortDefinitionTests.cs b/test/Spring/Spring.Core.Tests/Objects/Support/MutableSortDefinitionTests.cs index ed198635..de655eea 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Support/MutableSortDefinitionTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Support/MutableSortDefinitionTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Objects.Support; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Support/PropertyComparatorTests.cs b/test/Spring/Spring.Core.Tests/Objects/Support/PropertyComparatorTests.cs index 73a5c411..1549a38e 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Support/PropertyComparatorTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Support/PropertyComparatorTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Core; -#endregion - namespace Spring.Objects.Support; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/Support/StaticEventHandlerValueTests.cs b/test/Spring/Spring.Core.Tests/Objects/Support/StaticEventHandlerValueTests.cs index 0a4984a0..ad73653a 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Support/StaticEventHandlerValueTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Support/StaticEventHandlerValueTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Objects.Support; /// diff --git a/test/Spring/Spring.Core.Tests/Objects/TestEventHandler.cs b/test/Spring/Spring.Core.Tests/Objects/TestEventHandler.cs index 4cb74aa2..fe8a5a98 100644 --- a/test/Spring/Spring.Core.Tests/Objects/TestEventHandler.cs +++ b/test/Spring/Spring.Core.Tests/Objects/TestEventHandler.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Objects; internal class TestEventHandler diff --git a/test/Spring/Spring.Core.Tests/Objects/TestGenericObject.cs b/test/Spring/Spring.Core.Tests/Objects/TestGenericObject.cs index d429d4cc..29eebf28 100644 --- a/test/Spring/Spring.Core.Tests/Objects/TestGenericObject.cs +++ b/test/Spring/Spring.Core.Tests/Objects/TestGenericObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Objects; /// @@ -30,17 +22,11 @@ namespace Spring.Objects; /// Bruno Baia public class TestGenericObject { - #region Fields - private int _id = 0; private string _name = string.Empty; private IList _someGenericList = new List(); private IDictionary _someGenericDictionary = new Dictionary(); - #endregion - - #region Properties - public int ID { get { return _id; } @@ -65,10 +51,6 @@ public class TestGenericObject set { this._someGenericDictionary = value; } } - #endregion - - #region Constructor (s) / Destructor - public TestGenericObject() { } @@ -84,10 +66,6 @@ public class TestGenericObject this._name = name; } - #endregion - - #region Methods - public static List CreateList() { return new List(); @@ -97,6 +75,4 @@ public class TestGenericObject { return new TestGenericObject(); } - - #endregion } diff --git a/test/Spring/Spring.Core.Tests/Objects/TestObjectDAO.cs b/test/Spring/Spring.Core.Tests/Objects/TestObjectDAO.cs index 13a3afc5..23a30e3d 100644 --- a/test/Spring/Spring.Core.Tests/Objects/TestObjectDAO.cs +++ b/test/Spring/Spring.Core.Tests/Objects/TestObjectDAO.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; namespace Spring.Objects; diff --git a/test/Spring/Spring.Core.Tests/Objects/TestObjectList.cs b/test/Spring/Spring.Core.Tests/Objects/TestObjectList.cs index e93489e7..cb0ce863 100644 --- a/test/Spring/Spring.Core.Tests/Objects/TestObjectList.cs +++ b/test/Spring/Spring.Core.Tests/Objects/TestObjectList.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; -#endregion - namespace Spring.Objects; public interface ITestObjectCollection diff --git a/test/Spring/Spring.Core.Tests/Objects/TestTransparentProxyFactory.cs b/test/Spring/Spring.Core.Tests/Objects/TestTransparentProxyFactory.cs index a15c80f8..aadedcf3 100644 --- a/test/Spring/Spring.Core.Tests/Objects/TestTransparentProxyFactory.cs +++ b/test/Spring/Spring.Core.Tests/Objects/TestTransparentProxyFactory.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using System.Runtime.Remoting; using System.Runtime.Remoting.Messaging; diff --git a/test/Spring/Spring.Core.Tests/Objects/TypeMismatchExceptionTests.cs b/test/Spring/Spring.Core.Tests/Objects/TypeMismatchExceptionTests.cs index 95d6fe94..c1a58cd5 100644 --- a/test/Spring/Spring.Core.Tests/Objects/TypeMismatchExceptionTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/TypeMismatchExceptionTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Core; diff --git a/test/Spring/Spring.Core.Tests/Pool/Support/SimplePoolTest.cs b/test/Spring/Spring.Core.Tests/Pool/Support/SimplePoolTest.cs index 1484e0e5..e8f701f2 100644 --- a/test/Spring/Spring.Core.Tests/Pool/Support/SimplePoolTest.cs +++ b/test/Spring/Spring.Core.Tests/Pool/Support/SimplePoolTest.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Runtime.InteropServices; using FakeItEasy; @@ -27,8 +23,6 @@ using Spring.Threading; namespace Spring.Pool; -#region Inner Class : Helper - public class Helper { private Latch latch; @@ -70,16 +64,12 @@ public class Helper } } -#endregion - /// /// Unit tests for the SimplePool class. /// [TestFixture] public sealed class SimplePoolTests { - #region Inner Class : MyFactory (IPoolableObjectFactory implementation) - private sealed class MyFactory : IPoolableObjectFactory { public object MakeObject() @@ -105,8 +95,6 @@ public sealed class SimplePoolTests } } - #endregion - private IPoolableObjectFactory factory; private SimplePool pool; diff --git a/test/Spring/Spring.Core.Tests/Proxy/CompositionProxyTypeBuilderTests.cs b/test/Spring/Spring.Core.Tests/Proxy/CompositionProxyTypeBuilderTests.cs index c9166460..3ac6c7d9 100644 --- a/test/Spring/Spring.Core.Tests/Proxy/CompositionProxyTypeBuilderTests.cs +++ b/test/Spring/Spring.Core.Tests/Proxy/CompositionProxyTypeBuilderTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; -#endregion - namespace Spring.Proxy; /// diff --git a/test/Spring/Spring.Core.Tests/Proxy/DynamicProxyManagerTests.cs b/test/Spring/Spring.Core.Tests/Proxy/DynamicProxyManagerTests.cs index c1582d2a..d0af4990 100644 --- a/test/Spring/Spring.Core.Tests/Proxy/DynamicProxyManagerTests.cs +++ b/test/Spring/Spring.Core.Tests/Proxy/DynamicProxyManagerTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection.Emit; using NUnit.Framework; -#endregion - namespace Spring.Proxy; /// @@ -33,8 +25,6 @@ namespace Spring.Proxy; [TestFixture] public class DynamicProxyManagerTests { - #region WorkerThread Class - public class WorkerThread { private Exception _exception; @@ -77,8 +67,6 @@ public class DynamicProxyManagerTests } } - #endregion WorkerThread Class - [Test] public void CreateTypeBuilderMustNotBeCalledTwiceWithSameArguments() { diff --git a/test/Spring/Spring.Core.Tests/Proxy/ExplicitCompositionProxyTypeBuilderTests.cs b/test/Spring/Spring.Core.Tests/Proxy/ExplicitCompositionProxyTypeBuilderTests.cs index 688745be..62f37239 100644 --- a/test/Spring/Spring.Core.Tests/Proxy/ExplicitCompositionProxyTypeBuilderTests.cs +++ b/test/Spring/Spring.Core.Tests/Proxy/ExplicitCompositionProxyTypeBuilderTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; -#endregion - namespace Spring.Proxy; /// diff --git a/test/Spring/Spring.Core.Tests/Proxy/InheritanceProxyTypeBuilderTests.cs b/test/Spring/Spring.Core.Tests/Proxy/InheritanceProxyTypeBuilderTests.cs index 0d314d8e..f97dd052 100644 --- a/test/Spring/Spring.Core.Tests/Proxy/InheritanceProxyTypeBuilderTests.cs +++ b/test/Spring/Spring.Core.Tests/Proxy/InheritanceProxyTypeBuilderTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; using Spring.Util; -#endregion - namespace Spring.Proxy; /// @@ -322,8 +314,6 @@ public sealed class InheritanceProxyTypeBuilderTests : AbstractProxyTypeBuilderT } } -#region Helper Classes - public class NotSealedClass { public bool IsAnyoneThere() @@ -334,6 +324,4 @@ public class NotSealedClass public sealed class SealedClass { -} - -#endregion +} \ No newline at end of file diff --git a/test/Spring/Spring.Core.Tests/Reflection/Dynamic/BasePropertyTests.cs b/test/Spring/Spring.Core.Tests/Reflection/Dynamic/BasePropertyTests.cs index 949cb9ac..978fcd41 100644 --- a/test/Spring/Spring.Core.Tests/Reflection/Dynamic/BasePropertyTests.cs +++ b/test/Spring/Spring.Core.Tests/Reflection/Dynamic/BasePropertyTests.cs @@ -16,8 +16,6 @@ public abstract class BasePropertyTests protected Inventor pupin; protected Society ieee; - #region SetUp and TearDown - /// /// The setup logic executed before the execution of each individual test. /// @@ -47,8 +45,6 @@ public abstract class BasePropertyTests //DynamicReflectionManager.SaveAssembly(); } - #endregion - protected abstract IDynamicProperty Create(PropertyInfo property); [Test] @@ -151,8 +147,6 @@ public abstract class BasePropertyTests Assert.Throws(() => second.GetValue(something)); } - #region Performance tests - private DateTime start, stop; [Test] @@ -202,12 +196,8 @@ public abstract class BasePropertyTests { Debug.WriteLine(String.Format("{0,-60} {1,12:#,###} {2,12:##0.000} {3,12:#,###}", name, iterations, duration, iterations / duration)); } - - #endregion } -#region IL generation helper classes (they help if you look at them in Reflector ;-) - public class ValueTypeProperty //: IDynamicProperty { public object GetValue(object target) @@ -248,8 +238,6 @@ public class StaticProperty //: IDynamicProperty } } -#endregion - public class MyStaticClass { public const Int64 MyConst = 3456; diff --git a/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicConstructorTests.cs b/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicConstructorTests.cs index 9a7443c4..8ae4fbe5 100644 --- a/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicConstructorTests.cs +++ b/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicConstructorTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Diagnostics; using System.Reflection; using NUnit.Framework; using Spring.Context.Support; -#endregion - namespace Spring.Reflection.Dynamic; /// @@ -40,8 +32,6 @@ public sealed class DynamicConstructorTests private Inventor pupin; private Society ieee; - #region SetUp and TearDown - /// /// The setup logic executed before the execution of each individual test. /// @@ -71,8 +61,6 @@ public sealed class DynamicConstructorTests //DynamicReflectionManager.SaveAssembly(); } - #endregion - [Test] public void TestConstructors() { @@ -86,8 +74,6 @@ public sealed class DynamicConstructorTests Assert.AreEqual(DateTime.Today, newDate.Invoke(new object[] { DateTime.Today.Year, DateTime.Today.Month, DateTime.Today.Day })); } - #region Performance tests - private DateTime start, stop; //[Test] @@ -140,6 +126,4 @@ public sealed class DynamicConstructorTests { Debug.WriteLine(String.Format("{0,-60} {1,12:#,###} {2,12:##0.000} {3,12:#,###}", name, iterations, duration, iterations / duration)); } - - #endregion } diff --git a/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicFieldTests.cs b/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicFieldTests.cs index a4f03e33..da482283 100644 --- a/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicFieldTests.cs +++ b/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicFieldTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Diagnostics; using System.Reflection; using NUnit.Framework; @@ -37,8 +33,6 @@ public class DynamicFieldTests protected Inventor pupin; protected Society ieee; - #region SetUp and TearDown - /// /// The setup logic executed before the execution of each individual test. /// @@ -68,8 +62,6 @@ public class DynamicFieldTests //DynamicReflectionManager.SaveAssembly(); } - #endregion - protected virtual IDynamicField Create(FieldInfo field) { return DynamicField.Create(field); @@ -190,8 +182,6 @@ public class DynamicFieldTests Assert.AreEqual(2008, myField.GetValue(null)); } - #region Performance tests - private DateTime start, stop; //[Test] @@ -240,12 +230,8 @@ public class DynamicFieldTests { Debug.WriteLine(String.Format("{0,-60} {1,12:#,###} {2,12:##0.000} {3,12:#,###}", name, iterations, duration, iterations / duration)); } - - #endregion } -#region IL generation helper classes (they help if you look at them in Reflector ;-) - public class ValueTypeField : IDynamicField { public object GetValue(object target) @@ -296,6 +282,4 @@ public class StaticConst : IDynamicField public void SetValue(object target, object value) { } -} - -#endregion +} \ No newline at end of file diff --git a/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicMethodTests.cs b/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicMethodTests.cs index 1483b878..cd90aba3 100644 --- a/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicMethodTests.cs +++ b/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicMethodTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Diagnostics; using System.Reflection; @@ -38,8 +34,6 @@ public sealed class DynamicMethodTests private Inventor pupin; private Society ieee; - #region SetUp and TearDown - /// /// The setup logic executed before the execution of each individual test. /// @@ -69,8 +63,6 @@ public sealed class DynamicMethodTests //DynamicReflectionManager.SaveAssembly(); } - #endregion - private string RespectsPermissionsPrivateMethod() { return "Result"; @@ -271,8 +263,6 @@ public sealed class DynamicMethodTests Assert.AreEqual("done", done); } - #region Performance tests - private DateTime start, stop; //[Test] @@ -324,10 +314,6 @@ public sealed class DynamicMethodTests Debug.WriteLine(String.Format("{0,-60} {1,12:#,###} {2,12:##0.000} {3,12:#,###}", name, iterations, duration, iterations / duration)); } - #endregion - - #region Helper Classes - public class TestMethods { public static object PassReferenceArgumentStatic(object arg) @@ -350,12 +336,8 @@ public sealed class DynamicMethodTests return arg; } } - - #endregion } -#region IL generation helper classes (they help if you look at them in Reflector ;-) - public class InstanceMethod : IDynamicMethod { public object Invoke(object target, object[] args) @@ -446,6 +428,4 @@ public class RefOutTestObject : IRefOutTestObject output = "done"; reference++; } -} - -#endregion \ No newline at end of file +} \ No newline at end of file diff --git a/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicPropertyTests.cs b/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicPropertyTests.cs index 50eec2e4..2c84fc78 100644 --- a/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicPropertyTests.cs +++ b/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicPropertyTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; -#endregion - namespace Spring.Reflection.Dynamic; /// diff --git a/test/Spring/Spring.Core.Tests/Reflection/Dynamic/SafeFieldTests.cs b/test/Spring/Spring.Core.Tests/Reflection/Dynamic/SafeFieldTests.cs index ec33d1a9..3866d192 100644 --- a/test/Spring/Spring.Core.Tests/Reflection/Dynamic/SafeFieldTests.cs +++ b/test/Spring/Spring.Core.Tests/Reflection/Dynamic/SafeFieldTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; -#endregion - namespace Spring.Reflection.Dynamic; /// @@ -257,8 +249,6 @@ public class SafeFieldTests : DynamicFieldTests } } -#region Test Classes - public struct MyStructWithPrivateFields { // static part @@ -331,6 +321,4 @@ public class MyClassWithPrivateFields public void SetInstanceVTValue(int val) { instanceVTValue = val; } public void SetInstanceRefValue(object val) { instanceRefValue = val; } -} - -#endregion +} \ No newline at end of file diff --git a/test/Spring/Spring.Core.Tests/Reflection/Dynamic/SafePropertyTests.cs b/test/Spring/Spring.Core.Tests/Reflection/Dynamic/SafePropertyTests.cs index 023e6664..58de8a97 100644 --- a/test/Spring/Spring.Core.Tests/Reflection/Dynamic/SafePropertyTests.cs +++ b/test/Spring/Spring.Core.Tests/Reflection/Dynamic/SafePropertyTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.CodeDom.Compiler; using System.Reflection; using System.Text; @@ -142,8 +138,6 @@ public class SafePropertyTests : BasePropertyTests Assert.AreEqual(123, first.GetValue(something)); } - #region VB TestClass Code - private static Type s__visualBasicTestObjectType; private static IDynamicField ThisLastPropertyValue; private static IDynamicField ThisArg1; @@ -190,12 +184,8 @@ public class SafePropertyTests : BasePropertyTests return s__visualBasicTestObject; } - - #endregion } -#region Test Classes - public class MyClassWithPrivateProperties { public static object s_staticRef; @@ -272,6 +262,4 @@ public class MyClassWithPrivateProperties { set { _vt = value; } } -} - -#endregion +} \ No newline at end of file diff --git a/test/Spring/Spring.Core.Tests/SecurityTemplate.cs b/test/Spring/Spring.Core.Tests/SecurityTemplate.cs index 440e0f93..4666a205 100644 --- a/test/Spring/Spring.Core.Tests/SecurityTemplate.cs +++ b/test/Spring/Spring.Core.Tests/SecurityTemplate.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Configuration; using System.Data.SqlClient; using System.Drawing.Printing; diff --git a/test/Spring/Spring.Core.Tests/StandardsComplianceTest.cs b/test/Spring/Spring.Core.Tests/StandardsComplianceTest.cs index bd745bc4..63582753 100644 --- a/test/Spring/Spring.Core.Tests/StandardsComplianceTest.cs +++ b/test/Spring/Spring.Core.Tests/StandardsComplianceTest.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; -#endregion - namespace Spring; /// @@ -31,8 +23,6 @@ namespace Spring; /// public abstract class StandardsComplianceTest { - #region Constructor (s) / Destructor - /// /// Creates a new instance of the /// class. @@ -45,10 +35,6 @@ public abstract class StandardsComplianceTest /// protected StandardsComplianceTest() { } - #endregion - - #region Properties - protected Type CheckedType { get @@ -61,8 +47,6 @@ public abstract class StandardsComplianceTest } } - #endregion - private bool IsCheckedType(Type type) { if (CheckedType.IsInterface) @@ -104,9 +88,5 @@ public abstract class StandardsComplianceTest protected abstract void CheckStandardsCompliance(Assembly assembly, Type t); - #region Fields - private Type checkedType; - - #endregion } diff --git a/test/Spring/Spring.Core.Tests/StopWatch.cs b/test/Spring/Spring.Core.Tests/StopWatch.cs index f0ff9af6..0f1e164c 100644 --- a/test/Spring/Spring.Core.Tests/StopWatch.cs +++ b/test/Spring/Spring.Core.Tests/StopWatch.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring; /// diff --git a/test/Spring/Spring.Core.Tests/StreamHelperDecorator.cs b/test/Spring/Spring.Core.Tests/StreamHelperDecorator.cs index 589acce3..1e529825 100644 --- a/test/Spring/Spring.Core.Tests/StreamHelperDecorator.cs +++ b/test/Spring/Spring.Core.Tests/StreamHelperDecorator.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring; public delegate void StreamHelperCallback(out Stream stream); diff --git a/test/Spring/Spring.Core.Tests/TestResourceLoader.cs b/test/Spring/Spring.Core.Tests/TestResourceLoader.cs index 120b034d..ed67d532 100644 --- a/test/Spring/Spring.Core.Tests/TestResourceLoader.cs +++ b/test/Spring/Spring.Core.Tests/TestResourceLoader.cs @@ -22,8 +22,6 @@ namespace Spring; /// public class TestResourceLoader { - #region WebRequest - public class TestResourceWebResponse : WebResponse { private Type resourceType; @@ -68,8 +66,6 @@ public class TestResourceLoader } } - #endregion - static TestResourceLoader() { WebRequest.RegisterPrefix("testres", new TestResourceWebRequestFactory()); diff --git a/test/Spring/Spring.Core.Tests/Threading/AsyncTestMethod.cs b/test/Spring/Spring.Core.Tests/Threading/AsyncTestMethod.cs index 9c261dac..1bb2e377 100644 --- a/test/Spring/Spring.Core.Tests/Threading/AsyncTestMethod.cs +++ b/test/Spring/Spring.Core.Tests/Threading/AsyncTestMethod.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Threading; /// diff --git a/test/Spring/Spring.Core.Tests/Threading/AsyncTestTask.cs b/test/Spring/Spring.Core.Tests/Threading/AsyncTestTask.cs index 0933e390..33ca175b 100644 --- a/test/Spring/Spring.Core.Tests/Threading/AsyncTestTask.cs +++ b/test/Spring/Spring.Core.Tests/Threading/AsyncTestTask.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Threading; /// diff --git a/test/Spring/Spring.Core.Tests/Threading/CallContextStorageTests.cs b/test/Spring/Spring.Core.Tests/Threading/CallContextStorageTests.cs index ae77cdbf..df8977b8 100644 --- a/test/Spring/Spring.Core.Tests/Threading/CallContextStorageTests.cs +++ b/test/Spring/Spring.Core.Tests/Threading/CallContextStorageTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Threading; /// diff --git a/test/Spring/Spring.Core.Tests/Threading/CommonThreadStorageTests.cs b/test/Spring/Spring.Core.Tests/Threading/CommonThreadStorageTests.cs index 7f07c11f..8c913505 100644 --- a/test/Spring/Spring.Core.Tests/Threading/CommonThreadStorageTests.cs +++ b/test/Spring/Spring.Core.Tests/Threading/CommonThreadStorageTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Threading; /// @@ -129,8 +121,6 @@ public abstract class CommonThreadStorageTests Assert.IsNull(helper.value); } - #region Test Utility Classes - private class ThreadTestHelper { private CommonThreadStorageTests outer; @@ -157,6 +147,4 @@ public abstract class CommonThreadStorageTests value = storage.GetData("key"); } } - - #endregion Test Utility Classes } diff --git a/test/Spring/Spring.Core.Tests/Threading/LatchTest.cs b/test/Spring/Spring.Core.Tests/Threading/LatchTest.cs index 06a00659..b8c4ae41 100644 --- a/test/Spring/Spring.Core.Tests/Threading/LatchTest.cs +++ b/test/Spring/Spring.Core.Tests/Threading/LatchTest.cs @@ -1,7 +1,5 @@ using NUnit.Framework; -#region Licence - /* * Copyright 2002-2010 the original author or authors. * @@ -18,8 +16,6 @@ using NUnit.Framework; * limitations under the License. */ -#endregion - namespace Spring.Threading; [TestFixture] diff --git a/test/Spring/Spring.Core.Tests/Threading/LogicalThreadContextTest.cs b/test/Spring/Spring.Core.Tests/Threading/LogicalThreadContextTest.cs index cdecc2cf..633fab80 100644 --- a/test/Spring/Spring.Core.Tests/Threading/LogicalThreadContextTest.cs +++ b/test/Spring/Spring.Core.Tests/Threading/LogicalThreadContextTest.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using NUnit.Framework; -#endregion - namespace Spring.Threading; /// diff --git a/test/Spring/Spring.Core.Tests/Threading/SemaphoreTest.cs b/test/Spring/Spring.Core.Tests/Threading/SemaphoreTest.cs index 7750c1ea..4d9197f2 100644 --- a/test/Spring/Spring.Core.Tests/Threading/SemaphoreTest.cs +++ b/test/Spring/Spring.Core.Tests/Threading/SemaphoreTest.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Pool; using NUnit.Framework; diff --git a/test/Spring/Spring.Core.Tests/Threading/ThreadStaticStorageTests.cs b/test/Spring/Spring.Core.Tests/Threading/ThreadStaticStorageTests.cs index 481ff930..2d312cc4 100644 --- a/test/Spring/Spring.Core.Tests/Threading/ThreadStaticStorageTests.cs +++ b/test/Spring/Spring.Core.Tests/Threading/ThreadStaticStorageTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Threading; /// diff --git a/test/Spring/Spring.Core.Tests/Util/ArrayUtilsTests.cs b/test/Spring/Spring.Core.Tests/Util/ArrayUtilsTests.cs index 60b50169..db4de1b6 100644 --- a/test/Spring/Spring.Core.Tests/Util/ArrayUtilsTests.cs +++ b/test/Spring/Spring.Core.Tests/Util/ArrayUtilsTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Util; /// diff --git a/test/Spring/Spring.Core.Tests/Util/AssertUtilsTests.cs b/test/Spring/Spring.Core.Tests/Util/AssertUtilsTests.cs index 5d7c9e5a..56994f39 100644 --- a/test/Spring/Spring.Core.Tests/Util/AssertUtilsTests.cs +++ b/test/Spring/Spring.Core.Tests/Util/AssertUtilsTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; #if !NETCOREAPP using System.Runtime.Remoting; @@ -29,8 +23,6 @@ using System.Runtime.Remoting.Proxies; using NUnit.Framework; using Spring.Objects; -#endregion - namespace Spring.Util; /// diff --git a/test/Spring/Spring.Core.Tests/Util/CollectionUtilsTests.cs b/test/Spring/Spring.Core.Tests/Util/CollectionUtilsTests.cs index 3e521d63..5546e885 100644 --- a/test/Spring/Spring.Core.Tests/Util/CollectionUtilsTests.cs +++ b/test/Spring/Spring.Core.Tests/Util/CollectionUtilsTests.cs @@ -11,8 +11,6 @@ public class CollectionUtilsTests { internal class Iterator : IEnumerator { - #region IEnumerator Members - public void Reset() { // TODO: Add Iterator.Reset implementation @@ -32,8 +30,6 @@ public class CollectionUtilsTests // TODO: Add Iterator.MoveNext implementation return false; } - - #endregion } public void CopyTo(Array array, int index) diff --git a/test/Spring/Spring.Core.Tests/Util/ConfigXmlDocumentTests.cs b/test/Spring/Spring.Core.Tests/Util/ConfigXmlDocumentTests.cs index 7aa97af6..ecb18ef5 100644 --- a/test/Spring/Spring.Core.Tests/Util/ConfigXmlDocumentTests.cs +++ b/test/Spring/Spring.Core.Tests/Util/ConfigXmlDocumentTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Xml; using NUnit.Framework; -#endregion - namespace Spring.Util; /// diff --git a/test/Spring/Spring.Core.Tests/Util/DefensiveEventRaiserTests.cs b/test/Spring/Spring.Core.Tests/Util/DefensiveEventRaiserTests.cs index 2ab90e01..6f657ff1 100644 --- a/test/Spring/Spring.Core.Tests/Util/DefensiveEventRaiserTests.cs +++ b/test/Spring/Spring.Core.Tests/Util/DefensiveEventRaiserTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Util; /// diff --git a/test/Spring/Spring.Core.Tests/Util/DelegateInfoTests.cs b/test/Spring/Spring.Core.Tests/Util/DelegateInfoTests.cs index 6ecb8aee..9075b84a 100644 --- a/test/Spring/Spring.Core.Tests/Util/DelegateInfoTests.cs +++ b/test/Spring/Spring.Core.Tests/Util/DelegateInfoTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; -#endregion - namespace Spring.Util; /// diff --git a/test/Spring/Spring.Core.Tests/Util/EventRaiserTests.cs b/test/Spring/Spring.Core.Tests/Util/EventRaiserTests.cs index b2e6feb7..3e820e36 100644 --- a/test/Spring/Spring.Core.Tests/Util/EventRaiserTests.cs +++ b/test/Spring/Spring.Core.Tests/Util/EventRaiserTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; -#endregion - namespace Spring.Util; /// diff --git a/test/Spring/Spring.Core.Tests/Util/NumberUtilsTests.cs b/test/Spring/Spring.Core.Tests/Util/NumberUtilsTests.cs index 2184b2f4..12a7e598 100644 --- a/test/Spring/Spring.Core.Tests/Util/NumberUtilsTests.cs +++ b/test/Spring/Spring.Core.Tests/Util/NumberUtilsTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Util; /// diff --git a/test/Spring/Spring.Core.Tests/Util/ObjectUtilsTests.cs b/test/Spring/Spring.Core.Tests/Util/ObjectUtilsTests.cs index 434adb6c..212db165 100644 --- a/test/Spring/Spring.Core.Tests/Util/ObjectUtilsTests.cs +++ b/test/Spring/Spring.Core.Tests/Util/ObjectUtilsTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Reflection; using System.Runtime.Serialization; @@ -27,8 +21,6 @@ using System.Security.Policy; using NUnit.Framework; using Spring.Objects; -#endregion - namespace Spring.Util; /// @@ -297,8 +289,6 @@ public class ObjectUtilsTests Assert.Throws(() => ObjectUtils.EnumerateElementAtIndex(list, -10)); } - #region Helper Classes - private interface IFoo { } @@ -377,6 +367,4 @@ public class ObjectUtilsTests throw new ThrowingWithinConstructorException(); } } - - #endregion } diff --git a/test/Spring/Spring.Core.Tests/Util/PathMatcherTest.cs b/test/Spring/Spring.Core.Tests/Util/PathMatcherTest.cs index c46f67a4..453efeae 100644 --- a/test/Spring/Spring.Core.Tests/Util/PathMatcherTest.cs +++ b/test/Spring/Spring.Core.Tests/Util/PathMatcherTest.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; namespace Spring.Util; diff --git a/test/Spring/Spring.Core.Tests/Util/PatternMatchUtilsTests.cs b/test/Spring/Spring.Core.Tests/Util/PatternMatchUtilsTests.cs index 57352017..3491d8e9 100644 --- a/test/Spring/Spring.Core.Tests/Util/PatternMatchUtilsTests.cs +++ b/test/Spring/Spring.Core.Tests/Util/PatternMatchUtilsTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Util; /// diff --git a/test/Spring/Spring.Core.Tests/Util/PropertiesTests.cs b/test/Spring/Spring.Core.Tests/Util/PropertiesTests.cs index 47146b51..b3b3ad3d 100644 --- a/test/Spring/Spring.Core.Tests/Util/PropertiesTests.cs +++ b/test/Spring/Spring.Core.Tests/Util/PropertiesTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Text; using NUnit.Framework; -#endregion - namespace Spring.Util; /// diff --git a/test/Spring/Spring.Core.Tests/Util/ReflectionUtilsMemberwiseCopyTests.cs b/test/Spring/Spring.Core.Tests/Util/ReflectionUtilsMemberwiseCopyTests.cs index 885d61ed..5a4186de 100644 --- a/test/Spring/Spring.Core.Tests/Util/ReflectionUtilsMemberwiseCopyTests.cs +++ b/test/Spring/Spring.Core.Tests/Util/ReflectionUtilsMemberwiseCopyTests.cs @@ -89,8 +89,6 @@ public class ReflectionUtilsMemberwiseCopyTests } } -#region Test Support Classes - public class SampleBaseClass { private const string MyConstant = "SampleBaseClass.MyConstant"; @@ -159,6 +157,4 @@ public class SampleFurtherDerivedClass : SampleDerivedClass public SampleFurtherDerivedClass(string someConfigVal) : base(someConfigVal) { } -} - -#endregion +} \ No newline at end of file diff --git a/test/Spring/Spring.Core.Tests/Util/ReflectionUtilsTests.cs b/test/Spring/Spring.Core.Tests/Util/ReflectionUtilsTests.cs index fcd66470..56563621 100644 --- a/test/Spring/Spring.Core.Tests/Util/ReflectionUtilsTests.cs +++ b/test/Spring/Spring.Core.Tests/Util/ReflectionUtilsTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Reflection; using System.Reflection.Emit; @@ -37,8 +33,6 @@ namespace Spring.Util; [TestFixture] public sealed class ReflectionUtilsTests { - #region MapsInterfaceMethodsToImplementation utility classes - interface IMapsInterfaceMethodInterface { void SomeMethodA(); @@ -79,8 +73,6 @@ public sealed class ReflectionUtilsTests } } - #endregion - private class DummyException : ApplicationException { public DummyException() @@ -193,8 +185,6 @@ public sealed class ReflectionUtilsTests Assert.AreSame(instance.PropGetterInfo, method); } - #region Helper class for http: //jira.springframework.org/browse/SPRNET-992 tests - public class Foo { public readonly string a = ""; @@ -222,8 +212,6 @@ public sealed class ReflectionUtilsTests } } - #endregion - [Test(Description = "http://jira.springframework.org/browse/SPRNET-992")] public void ShouldPickDefaultConstructorWithoutArgs() { @@ -937,8 +925,6 @@ public sealed class ReflectionUtilsTests Assert.AreSame(candidateConstructors[1], resolvedConstructor); } - #region GetInterfaces - [Test] public void GetInterfaces() { @@ -970,10 +956,6 @@ public sealed class ReflectionUtilsTests { } - #endregion - - #region IsTypeVisible Tests - [Test] public void IsTypeVisibleWithInternalType() { @@ -1182,10 +1164,6 @@ public sealed class ReflectionUtilsTests #endif } - #endregion - - #region GetExplicitBaseException - [Test] public void GetExplicitBaseExceptionWithNoInnerException() { @@ -1234,10 +1212,6 @@ public sealed class ReflectionUtilsTests Assert.AreEqual("System.Collections.Generic.List>", ReflectionUtils.GetTypeFriendlyName(t)); } - #endregion - - #region Helper Methods - public int Add(ref int one, int two) { return one + two; @@ -1275,12 +1249,8 @@ public sealed class ReflectionUtilsTests return classBuilder.CreateType(); } #endif - - #endregion } -#region Simple Helper Classes - public class PublicType { public class PublicNestedType @@ -1595,6 +1565,4 @@ public sealed class ClassWithAttributes public void MethodWithAttributes() { } -} - -#endregion +} \ No newline at end of file diff --git a/test/Spring/Spring.Core.Tests/Util/SerializationTestUtils.cs b/test/Spring/Spring.Core.Tests/Util/SerializationTestUtils.cs index 89af6e8f..222685c3 100644 --- a/test/Spring/Spring.Core.Tests/Util/SerializationTestUtils.cs +++ b/test/Spring/Spring.Core.Tests/Util/SerializationTestUtils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using System.Runtime.Serialization.Formatters.Binary; using NUnit.Framework; diff --git a/test/Spring/Spring.Core.Tests/Util/StringUtilsTests.cs b/test/Spring/Spring.Core.Tests/Util/StringUtilsTests.cs index 15eb1467..8e7106cd 100644 --- a/test/Spring/Spring.Core.Tests/Util/StringUtilsTests.cs +++ b/test/Spring/Spring.Core.Tests/Util/StringUtilsTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Util; /// diff --git a/test/Spring/Spring.Core.Tests/Util/SystemUtilsTests.cs b/test/Spring/Spring.Core.Tests/Util/SystemUtilsTests.cs index 7ebad7cf..6d6b4327 100644 --- a/test/Spring/Spring.Core.Tests/Util/SystemUtilsTests.cs +++ b/test/Spring/Spring.Core.Tests/Util/SystemUtilsTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Util; /// diff --git a/test/Spring/Spring.Core.Tests/Util/UniqueKeyTests.cs b/test/Spring/Spring.Core.Tests/Util/UniqueKeyTests.cs index d2132342..68ab4334 100644 --- a/test/Spring/Spring.Core.Tests/Util/UniqueKeyTests.cs +++ b/test/Spring/Spring.Core.Tests/Util/UniqueKeyTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Util; /// diff --git a/test/Spring/Spring.Core.Tests/Validation/Actions/ErrorMessageActionTests.cs b/test/Spring/Spring.Core.Tests/Validation/Actions/ErrorMessageActionTests.cs index 2d631070..d32286f3 100644 --- a/test/Spring/Spring.Core.Tests/Validation/Actions/ErrorMessageActionTests.cs +++ b/test/Spring/Spring.Core.Tests/Validation/Actions/ErrorMessageActionTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Context.Support; using Spring.Expressions; diff --git a/test/Spring/Spring.Core.Tests/Validation/Actions/ExceptionActionTests.cs b/test/Spring/Spring.Core.Tests/Validation/Actions/ExceptionActionTests.cs index 5a97fedd..dca1376d 100644 --- a/test/Spring/Spring.Core.Tests/Validation/Actions/ExceptionActionTests.cs +++ b/test/Spring/Spring.Core.Tests/Validation/Actions/ExceptionActionTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Expressions; diff --git a/test/Spring/Spring.Core.Tests/Validation/Actions/ExpressionActionTests.cs b/test/Spring/Spring.Core.Tests/Validation/Actions/ExpressionActionTests.cs index 1e431fd1..cbdc4a82 100644 --- a/test/Spring/Spring.Core.Tests/Validation/Actions/ExpressionActionTests.cs +++ b/test/Spring/Spring.Core.Tests/Validation/Actions/ExpressionActionTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Expressions; diff --git a/test/Spring/Spring.Core.Tests/Validation/AnyValidatorGroupTests.cs b/test/Spring/Spring.Core.Tests/Validation/AnyValidatorGroupTests.cs index 4c6da903..48f7b451 100644 --- a/test/Spring/Spring.Core.Tests/Validation/AnyValidatorGroupTests.cs +++ b/test/Spring/Spring.Core.Tests/Validation/AnyValidatorGroupTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Expressions; -#endregion - namespace Spring.Validation; /// diff --git a/test/Spring/Spring.Core.Tests/Validation/ExclusiveValidatorGroupTests.cs b/test/Spring/Spring.Core.Tests/Validation/ExclusiveValidatorGroupTests.cs index b8d74ab0..ff498ec3 100644 --- a/test/Spring/Spring.Core.Tests/Validation/ExclusiveValidatorGroupTests.cs +++ b/test/Spring/Spring.Core.Tests/Validation/ExclusiveValidatorGroupTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Expressions; using Spring.Validation.Actions; -#endregion - namespace Spring.Validation; /// diff --git a/test/Spring/Spring.Core.Tests/Validation/HelperClasses.cs b/test/Spring/Spring.Core.Tests/Validation/HelperClasses.cs index 1038d478..6ff5af84 100644 --- a/test/Spring/Spring.Core.Tests/Validation/HelperClasses.cs +++ b/test/Spring/Spring.Core.Tests/Validation/HelperClasses.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects.Factory.Config; using Spring.Objects.Factory.Support; using Spring.Validation.Actions; diff --git a/test/Spring/Spring.Core.Tests/Validation/ValidationErrorsTests.cs b/test/Spring/Spring.Core.Tests/Validation/ValidationErrorsTests.cs index 838544f8..a2146a72 100644 --- a/test/Spring/Spring.Core.Tests/Validation/ValidationErrorsTests.cs +++ b/test/Spring/Spring.Core.Tests/Validation/ValidationErrorsTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Xml.Serialization; using NUnit.Framework; using Spring.Context.Support; -#endregion - namespace Spring.Validation; /// diff --git a/test/Spring/Spring.Core.Tests/Validation/ValidationExceptionTests.cs b/test/Spring/Spring.Core.Tests/Validation/ValidationExceptionTests.cs index af6b97f8..13cced65 100644 --- a/test/Spring/Spring.Core.Tests/Validation/ValidationExceptionTests.cs +++ b/test/Spring/Spring.Core.Tests/Validation/ValidationExceptionTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization.Formatters.Binary; using NUnit.Framework; diff --git a/test/Spring/Spring.Core.Tests/Validation/ValidationNamespaceParserTests.cs b/test/Spring/Spring.Core.Tests/Validation/ValidationNamespaceParserTests.cs index 8874667b..da269914 100644 --- a/test/Spring/Spring.Core.Tests/Validation/ValidationNamespaceParserTests.cs +++ b/test/Spring/Spring.Core.Tests/Validation/ValidationNamespaceParserTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Xml; using NUnit.Framework; using Spring.Core.IO; @@ -30,8 +24,6 @@ using Spring.Objects.Factory.Xml; using Spring.Validation.Actions; using Spring.Validation.Config; -#endregion - namespace Spring.Validation; /// diff --git a/test/Spring/Spring.Core.Tests/Validation/ValidatorGroupTests.cs b/test/Spring/Spring.Core.Tests/Validation/ValidatorGroupTests.cs index f57972ba..28ba398b 100644 --- a/test/Spring/Spring.Core.Tests/Validation/ValidatorGroupTests.cs +++ b/test/Spring/Spring.Core.Tests/Validation/ValidatorGroupTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using NUnit.Framework; using Spring.Expressions; -#endregion - namespace Spring.Validation; /// diff --git a/test/Spring/Spring.Core.Tests/Validation/ValidatorReferenceTests.cs b/test/Spring/Spring.Core.Tests/Validation/ValidatorReferenceTests.cs index d7d79c48..e2017edf 100644 --- a/test/Spring/Spring.Core.Tests/Validation/ValidatorReferenceTests.cs +++ b/test/Spring/Spring.Core.Tests/Validation/ValidatorReferenceTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Expressions; using Spring.Objects.Factory.Support; diff --git a/test/Spring/Spring.Core.Tests/Validation/Validators/ConditionValidatorTests.cs b/test/Spring/Spring.Core.Tests/Validation/Validators/ConditionValidatorTests.cs index 5aa33f69..8eb5389b 100644 --- a/test/Spring/Spring.Core.Tests/Validation/Validators/ConditionValidatorTests.cs +++ b/test/Spring/Spring.Core.Tests/Validation/Validators/ConditionValidatorTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Context.Support; using Spring.Expressions; using Spring.Validation.Actions; -#endregion - namespace Spring.Validation.Validators; /// diff --git a/test/Spring/Spring.Core.Tests/Validation/Validators/CreditCardValidatorTests.cs b/test/Spring/Spring.Core.Tests/Validation/Validators/CreditCardValidatorTests.cs index 73d28108..89d1f5bb 100644 --- a/test/Spring/Spring.Core.Tests/Validation/Validators/CreditCardValidatorTests.cs +++ b/test/Spring/Spring.Core.Tests/Validation/Validators/CreditCardValidatorTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Validation.Validators; /// diff --git a/test/Spring/Spring.Core.Tests/Validation/Validators/EmailValidatorTests.cs b/test/Spring/Spring.Core.Tests/Validation/Validators/EmailValidatorTests.cs index 017966bd..0a0ae350 100644 --- a/test/Spring/Spring.Core.Tests/Validation/Validators/EmailValidatorTests.cs +++ b/test/Spring/Spring.Core.Tests/Validation/Validators/EmailValidatorTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Validation.Validators; /// diff --git a/test/Spring/Spring.Core.Tests/Validation/Validators/ISBNValidatorTests.cs b/test/Spring/Spring.Core.Tests/Validation/Validators/ISBNValidatorTests.cs index 0eacd834..31fa7b1b 100644 --- a/test/Spring/Spring.Core.Tests/Validation/Validators/ISBNValidatorTests.cs +++ b/test/Spring/Spring.Core.Tests/Validation/Validators/ISBNValidatorTests.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Validation.Validators; /// diff --git a/test/Spring/Spring.Core.Tests/Validation/Validators/Integration/CreditCardValidatorIntegrationTests.cs b/test/Spring/Spring.Core.Tests/Validation/Validators/Integration/CreditCardValidatorIntegrationTests.cs index 1cdf18a1..1ff7a100 100644 --- a/test/Spring/Spring.Core.Tests/Validation/Validators/Integration/CreditCardValidatorIntegrationTests.cs +++ b/test/Spring/Spring.Core.Tests/Validation/Validators/Integration/CreditCardValidatorIntegrationTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Text; using NUnit.Framework; using Spring.Core.IO; using Spring.Objects; using Spring.Objects.Factory.Xml; -#endregion - namespace Spring.Validation.Validators; /// diff --git a/test/Spring/Spring.Core.Tests/Validation/Validators/Integration/EmailValidatorIntegrationTests.cs b/test/Spring/Spring.Core.Tests/Validation/Validators/Integration/EmailValidatorIntegrationTests.cs index 18cfc254..064978cf 100644 --- a/test/Spring/Spring.Core.Tests/Validation/Validators/Integration/EmailValidatorIntegrationTests.cs +++ b/test/Spring/Spring.Core.Tests/Validation/Validators/Integration/EmailValidatorIntegrationTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Text; using NUnit.Framework; using Spring.Core.IO; using Spring.Objects.Factory.Xml; -#endregion - namespace Spring.Validation.Validators; /// diff --git a/test/Spring/Spring.Core.Tests/Validation/Validators/Integration/ISBNValidatorIntegrationTests.cs b/test/Spring/Spring.Core.Tests/Validation/Validators/Integration/ISBNValidatorIntegrationTests.cs index d5d63455..51e0f41b 100644 --- a/test/Spring/Spring.Core.Tests/Validation/Validators/Integration/ISBNValidatorIntegrationTests.cs +++ b/test/Spring/Spring.Core.Tests/Validation/Validators/Integration/ISBNValidatorIntegrationTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Text; using NUnit.Framework; using Spring.Core.IO; using Spring.Objects.Factory.Xml; -#endregion - namespace Spring.Validation.Validators; /// diff --git a/test/Spring/Spring.Core.Tests/Validation/Validators/Integration/UrlValidatorIntegrationTests.cs b/test/Spring/Spring.Core.Tests/Validation/Validators/Integration/UrlValidatorIntegrationTests.cs index deb62fda..8dd56e65 100644 --- a/test/Spring/Spring.Core.Tests/Validation/Validators/Integration/UrlValidatorIntegrationTests.cs +++ b/test/Spring/Spring.Core.Tests/Validation/Validators/Integration/UrlValidatorIntegrationTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Text; using NUnit.Framework; using Spring.Core.IO; using Spring.Objects.Factory.Xml; -#endregion - namespace Spring.Validation.Validators; /// diff --git a/test/Spring/Spring.Core.Tests/Validation/Validators/RegularExpressionValidatorTests.cs b/test/Spring/Spring.Core.Tests/Validation/Validators/RegularExpressionValidatorTests.cs index 1a815b09..ab9a6d1f 100644 --- a/test/Spring/Spring.Core.Tests/Validation/Validators/RegularExpressionValidatorTests.cs +++ b/test/Spring/Spring.Core.Tests/Validation/Validators/RegularExpressionValidatorTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Text.RegularExpressions; using NUnit.Framework; using Spring.Expressions; -#endregion - namespace Spring.Validation.Validators; /// diff --git a/test/Spring/Spring.Core.Tests/Validation/Validators/RequiredValidatorTests.cs b/test/Spring/Spring.Core.Tests/Validation/Validators/RequiredValidatorTests.cs index fade07b1..5b3585e1 100644 --- a/test/Spring/Spring.Core.Tests/Validation/Validators/RequiredValidatorTests.cs +++ b/test/Spring/Spring.Core.Tests/Validation/Validators/RequiredValidatorTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Expressions; -#endregion - namespace Spring.Validation.Validators; /// diff --git a/test/Spring/Spring.Core.Tests/Validation/Validators/UrlValidatorTests.cs b/test/Spring/Spring.Core.Tests/Validation/Validators/UrlValidatorTests.cs index a9ba3b3f..41fef880 100644 --- a/test/Spring/Spring.Core.Tests/Validation/Validators/UrlValidatorTests.cs +++ b/test/Spring/Spring.Core.Tests/Validation/Validators/UrlValidatorTests.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Validation.Validators; /// diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/AdoDaoTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/AdoDaoTests.cs index 77d75b09..547d578b 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/AdoDaoTests.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/AdoDaoTests.cs @@ -119,8 +119,6 @@ public class AdoDaoTests : AbstractTransactionalSpringContextTests Assert.IsNull(to3); } - #region Overrides of AbstractDependencyInjectionSpringContextTests - /// /// Subclasses must implement this property to return the locations of their /// config files. A plain path will be treated as a file system location. @@ -139,6 +137,4 @@ public class AdoDaoTests : AbstractTransactionalSpringContextTests TestObjectDao.Cleanup(); base.OnSetUp(); } - - #endregion } \ No newline at end of file diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/AdoTemplatePerformanceTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/AdoTemplatePerformanceTests.cs index 0160709c..43af6cea 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/AdoTemplatePerformanceTests.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/AdoTemplatePerformanceTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Data; using System.Data.SqlClient; using System.Diagnostics; @@ -31,8 +25,6 @@ using Spring.Reflection.Dynamic; using Spring.Transaction.Support; using Spring.Util; -#endregion - namespace Spring.Data; /// diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/AdoTemplateTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/AdoTemplateTests.cs index 75cb6322..57b3cbc5 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/AdoTemplateTests.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/AdoTemplateTests.cs @@ -1,5 +1,3 @@ -#region Licence - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Data; using System.Data.Common; @@ -33,8 +27,6 @@ using Spring.Objects; using Spring.Transaction; using Spring.Transaction.Support; -#endregion - namespace Spring.Data; /// @@ -44,16 +36,10 @@ namespace Spring.Data; [TestFixture] public class AdoTemplateTests { - #region Fields - IAdoOperations adoOperations; IDbProvider dbProvider; private IPlatformTransactionManager transactionManager; - #endregion - - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -61,10 +47,6 @@ public class AdoTemplateTests { } - #endregion - - #region Methods - [SetUp] public void CreateAdoTemplate() { @@ -316,8 +298,6 @@ public class AdoTemplateTests adoOperations.ExecuteNonQuery(CommandType.Text, sql, parameters); } - #endregion - private class TestObjectExtractor : IResultSetExtractor { public object ExtractData(IDataReader reader) diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/AutoDeclarativeTxTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/AutoDeclarativeTxTests.cs index 33f17608..e9247c72 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/AutoDeclarativeTxTests.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/AutoDeclarativeTxTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Context; using Spring.Context.Support; using Spring.Data.Common; using Spring.Transaction; -#endregion - namespace Spring.Data; /// diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/CallCreateTestObject.cs b/test/Spring/Spring.Data.Integration.Tests/Data/CallCreateTestObject.cs index 04ad32b8..96a7102b 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/CallCreateTestObject.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/CallCreateTestObject.cs @@ -1,5 +1,3 @@ -#region Licence - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Data.Common; using Spring.Data.Objects; -#endregion - namespace Spring.Data; /// diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/CreateTestObjectNonQuery.cs b/test/Spring/Spring.Data.Integration.Tests/Data/CreateTestObjectNonQuery.cs index 8a1564f3..5e64fd4c 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/CreateTestObjectNonQuery.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/CreateTestObjectNonQuery.cs @@ -1,5 +1,3 @@ -#region Licence - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Data; using Spring.Data.Common; using Spring.Data.Objects; -#endregion - namespace Spring.Data; /// diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/DTCTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/DTCTests.cs index ac0d3d62..40540aa9 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/DTCTests.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/DTCTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Context; using Spring.Context.Support; -#endregion - namespace Spring.Data; [TestFixture] diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/DTCTestsNoInterfaces.cs b/test/Spring/Spring.Data.Integration.Tests/Data/DTCTestsNoInterfaces.cs index e574f197..539d1a96 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/DTCTestsNoInterfaces.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/DTCTestsNoInterfaces.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Context; using Spring.Context.Support; -#endregion - namespace Spring.Data; [TestFixture] diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/DeclarativeTxTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/DeclarativeTxTests.cs index f7372b12..24b9e07e 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/DeclarativeTxTests.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/DeclarativeTxTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Context; using Spring.Context.Support; using Spring.Data.Common; using Spring.Transaction; -#endregion - namespace Spring.Data; /// diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/Generic/GenericAdoTemplateTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/Generic/GenericAdoTemplateTests.cs index cc50c7b1..d43fb00a 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/Generic/GenericAdoTemplateTests.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/Generic/GenericAdoTemplateTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; using System.Data.Common; using System.Data.SqlClient; diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/Generic/ITestObjectDao.cs b/test/Spring/Spring.Data.Integration.Tests/Data/Generic/ITestObjectDao.cs index 9d0673b7..8e9a2941 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/Generic/ITestObjectDao.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/Generic/ITestObjectDao.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Objects; namespace Spring.Data.Generic; diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/Generic/TestObjectDao.cs b/test/Spring/Spring.Data.Integration.Tests/Data/Generic/TestObjectDao.cs index 2a0f5e5b..8a7c24f4 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/Generic/TestObjectDao.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/Generic/TestObjectDao.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; using Spring.Objects; diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/Generic/TestObjectRowMapper.cs b/test/Spring/Spring.Data.Integration.Tests/Data/Generic/TestObjectRowMapper.cs index f44d15d8..d882835c 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/Generic/TestObjectRowMapper.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/Generic/TestObjectRowMapper.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; using Spring.Objects; diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/MappingAdoQueryTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/MappingAdoQueryTests.cs index 6a363c92..fa2fec14 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/MappingAdoQueryTests.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/MappingAdoQueryTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using NUnit.Framework; using Spring.Context; @@ -27,8 +21,6 @@ using Spring.Context.Support; using Spring.Data.Common; using Spring.Objects; -#endregion - namespace Spring.Data; /// @@ -38,20 +30,10 @@ namespace Spring.Data; [TestFixture] public class MappingAdoQueryTests { - #region Fields - IDbProvider dbProvider; - #endregion - - #region Constants - private IApplicationContext ctx; - #endregion - - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -59,14 +41,6 @@ public class MappingAdoQueryTests { } - #endregion - - #region Properties - - #endregion - - #region Methods - [SetUp] public void CreateDbProvider() { @@ -106,6 +80,4 @@ public class MappingAdoQueryTests IList testObjectList = testObjectQuery.QueryByNamedParam(inParams); Assert.AreEqual(1, testObjectList.Count); } - - #endregion } diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/NativeAdoTestObjectDao.cs b/test/Spring/Spring.Data.Integration.Tests/Data/NativeAdoTestObjectDao.cs index f9125858..ca03ec5c 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/NativeAdoTestObjectDao.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/NativeAdoTestObjectDao.cs @@ -1,13 +1,9 @@ -#region Imports - using System.Collections; using System.Data; using System.Data.SqlClient; using System.Text; using Spring.Objects; -#endregion - namespace Spring.Data; public class NativeAdoTestObjectDao : ITestObjectDao diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/NativeAdoTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/NativeAdoTests.cs index 135004a2..dcfcb5d0 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/NativeAdoTests.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/NativeAdoTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Data; using System.Data.SqlClient; using NUnit.Framework; using Spring.Context; using Spring.Context.Support; -#endregion - namespace Spring.Data; [TestFixture] diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/NestedTxScopeTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/NestedTxScopeTests.cs index cbf53d09..340a8fbb 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/NestedTxScopeTests.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/NestedTxScopeTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Data; using System.Data.SqlClient; using System.Transactions; @@ -29,8 +23,6 @@ using Spring.Data.Core; using Spring.Transaction; using Spring.Transaction.Support; -#endregion - namespace Spring.Data; /// @@ -157,15 +149,11 @@ public class NestedTxScopeTests cn2005.Open(); cmd.ExecuteNonQuery(); - #region logging - Console.WriteLine("TransactionSynchronizationManager.CurrentTransactionIsolationLevel = " + TransactionSynchronizationManager.CurrentTransactionIsolationLevel); Console.WriteLine("System.Transactions.Transaction.Current.IsolationLevel = " + System.Transactions.Transaction.Current.IsolationLevel); string name = TransactionSynchronizationManager.CurrentTransactionName; bool read = TransactionSynchronizationManager.CurrentTransactionReadOnly; - - #endregion } } } diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/Northwind/AdoTemplateShipperDao.cs b/test/Spring/Spring.Data.Integration.Tests/Data/Northwind/AdoTemplateShipperDao.cs index c4181a8a..744a5487 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/Northwind/AdoTemplateShipperDao.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/Northwind/AdoTemplateShipperDao.cs @@ -1,5 +1,3 @@ -#region Licence - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Data; using Spring.Data.Common; using Spring.Data.Core; -#endregion - namespace Spring.Data.Northwind; /// @@ -34,8 +26,6 @@ namespace Spring.Data.Northwind; /// Mark Pollack (.NET) public class AdoTemplateShipperDao : AdoDaoSupport, IShipperDao { - #region IShipperDao Members - public Shipper Create(string name, string phone) { string sql = "INSERT INTO Shippers (CompanyName, Phone) VALUES (@CompanyName, @Phone) SET @ShipperID = SCOPE_IDENTITY()"; @@ -54,6 +44,4 @@ public class AdoTemplateShipperDao : AdoDaoSupport, IShipperDao return new Shipper(id, name, phone); //10 } - - #endregion } diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/Northwind/IShipperDao.cs b/test/Spring/Spring.Data.Integration.Tests/Data/Northwind/IShipperDao.cs index 43375e2c..b151b255 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/Northwind/IShipperDao.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/Northwind/IShipperDao.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Data.Northwind; /// diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/Northwind/NativeAdoShipperDao.cs b/test/Spring/Spring.Data.Integration.Tests/Data/Northwind/NativeAdoShipperDao.cs index 7f251ef6..2c95b003 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/Northwind/NativeAdoShipperDao.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/Northwind/NativeAdoShipperDao.cs @@ -1,5 +1,3 @@ -#region Licence - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,22 +14,14 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Data; using System.Data.SqlClient; -#endregion - namespace Spring.Data.Northwind; /// Mark Pollack (.NET) public class NativeAdoShipperDao : IShipperDao { - #region IShipperDao Members - public Shipper Create(string name, string phone) { string connectionString = "Data Source=SPRINGQA;Initial Catalog=Northwind;Persist Security Info=True;User ID=springqa;Password=springqa"; @@ -87,6 +77,4 @@ public class NativeAdoShipperDao : IShipperDao return new Shipper(id, name, phone); //17 } - - #endregion } diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/Northwind/Shipper.cs b/test/Spring/Spring.Data.Integration.Tests/Data/Northwind/Shipper.cs index 43ea3e84..77675d4a 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/Northwind/Shipper.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/Northwind/Shipper.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,19 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Data.Northwind; /// Mark Pollack (.NET) public class Shipper { - #region Fields - public int Id { get { return id; } @@ -51,10 +41,6 @@ public class Shipper private string name; private string phone; - #endregion - - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -68,14 +54,4 @@ public class Shipper this.name = name; this.phone = phone; } - - #endregion - - #region Properties - - #endregion - - #region Methods - - #endregion } diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/Objects/Generic/StoredProcedureTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/Objects/Generic/StoredProcedureTests.cs index d1263c59..6e86f74e 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/Objects/Generic/StoredProcedureTests.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/Objects/Generic/StoredProcedureTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Data; using System.Reflection; @@ -28,8 +22,6 @@ using Spring.Data.Common; using Spring.Data.Generic; using Spring.Objects; -#endregion - namespace Spring.Data.Objects.Generic; /// diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/Objects/Generic/Vacation.cs b/test/Spring/Spring.Data.Integration.Tests/Data/Objects/Generic/Vacation.cs index 9aa08dd6..3765435b 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/Objects/Generic/Vacation.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/Objects/Generic/Vacation.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Data.Objects.Generic; public class Vacation diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/Objects/Generic/VacationRowMapper.cs b/test/Spring/Spring.Data.Integration.Tests/Data/Objects/Generic/VacationRowMapper.cs index 1f50b833..e26faf72 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/Objects/Generic/VacationRowMapper.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/Objects/Generic/VacationRowMapper.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; using Spring.Data.Generic; diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/OracleAdoTemplateTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/OracleAdoTemplateTests.cs index 3fad7b12..73dfb2a9 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/OracleAdoTemplateTests.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/OracleAdoTemplateTests.cs @@ -1,5 +1,3 @@ -#region Licence - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region - using System.Collections; using System.Data; using System.Data.Common; @@ -31,8 +25,6 @@ using Spring.Data.Common; using Spring.Data.Core; using Spring.Objects; -#endregion - namespace Spring.Data; /// @@ -43,8 +35,6 @@ namespace Spring.Data; [Ignore("ORACLE-dependent tests disabled for integration runs")] public class OracleAdoTemplateTests { - #region Setup/Teardown - [SetUp] public void CreateAdoTemplate() { @@ -57,8 +47,6 @@ public class OracleAdoTemplateTests adoOperations = new AdoTemplate(dbProvider); } - #endregion - private IAdoOperations adoOperations; private IDbProvider dbProvider; @@ -69,8 +57,6 @@ public class OracleAdoTemplateTests private class TestObjectExtractor : IResultSetExtractor { - #region IResultSetExtractor Members - public object ExtractData(IDataReader reader) { IList testObjects = new ArrayList(); @@ -85,8 +71,6 @@ public class OracleAdoTemplateTests return testObjects; } - - #endregion } [Test] diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/SQLiteTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/SQLiteTests.cs index 83d1c59f..e0b2bbde 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/SQLiteTests.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/SQLiteTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Data; using System.Data.Odbc; @@ -29,8 +23,6 @@ using Spring.Data.Common; using Spring.Data.Generic; using Spring.Data.Objects; -#endregion - namespace Spring.Data; /// diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/StoredProcedureTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/StoredProcedureTests.cs index 247e9837..401142b8 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/StoredProcedureTests.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/StoredProcedureTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Data; using NUnit.Framework; @@ -28,8 +22,6 @@ using Spring.Context.Support; using Spring.Data.Common; using Spring.Data.Core; -#endregion - namespace Spring.Data; /// @@ -39,13 +31,9 @@ namespace Spring.Data; [TestFixture] public class StoredProcedureTests { - #region Fields - IAdoOperations adoOperations; IDbProvider dbProvider; - #endregion - [SetUp] public void CreateAdoTemplate() { diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/Support/SimpleExceptionTranslationTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/Support/SimpleExceptionTranslationTests.cs index 3838d79c..9221da4f 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/Support/SimpleExceptionTranslationTests.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/Support/SimpleExceptionTranslationTests.cs @@ -1,5 +1,3 @@ -#region Licence - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Data; using Microsoft.Extensions.Logging; using NUnit.Framework; @@ -28,31 +22,19 @@ using Spring.Context.Support; using Spring.Data.Common; using Spring.Data.Core; -#endregion - namespace Spring.Data.Support; [TestFixture] public class SimpleExceptionTranslationTests { - #region Fields - private IDbProvider dbProvider; private IAdoOperations adoOperations; - #endregion - - #region Constants - /// /// The shared ILog instance for this class (and derived classes). /// protected static readonly ILog log = LogManager.GetLogger(); - #endregion - - #region Methods - [SetUp] public void CreateAdoTemplate() { @@ -83,6 +65,4 @@ public class SimpleExceptionTranslationTests Assert.Fail("did not throw exception of type BadSqlGrammerException"); } } - - #endregion } diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/TestCoordinator.cs b/test/Spring/Spring.Data.Integration.Tests/Data/TestCoordinator.cs index 8e2d5767..b6cb0e67 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/TestCoordinator.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/TestCoordinator.cs @@ -12,12 +12,8 @@ public class TestCoordinator : ITestCoordinator set { testObjectManager = value; } } - #region ITestCoordinator Members - public void WorkOn(TestObject to1, TestObject to2) { testObjectManager.SaveTwoTestObjects(to1, to2); } - - #endregion } diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectDao.cs b/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectDao.cs index 80931b09..e74e8217 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectDao.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectDao.cs @@ -125,8 +125,6 @@ public class TestObjectDao : AdoDaoSupport, ITestObjectDao private class TestObjectRowMapper : IRowMapper { - #region IRowMapper Members - public object MapRow(IDataReader dataReader, int rowNum) { TestObject to = new TestObject(); @@ -135,8 +133,6 @@ public class TestObjectDao : AdoDaoSupport, ITestObjectDao to.Name = dataReader.GetString(2); return to; } - - #endregion } public void Cleanup() diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectManager.cs b/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectManager.cs index b7c13595..f46bc9c5 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectManager.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectManager.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using Microsoft.Extensions.Logging; using Spring.Objects; using Spring.Transaction.Interceptor; using Spring.Transaction.Support; -#endregion - namespace Spring.Data; /// @@ -36,15 +28,9 @@ namespace Spring.Data; /// Mark Pollack (.NET) public class TestObjectManager : ITestObjectManager { - #region Fields - ITestObjectDao testObjectDao; private static readonly ILogger LOG = LogManager.GetLogger(); - #endregion - - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -52,20 +38,12 @@ public class TestObjectManager : ITestObjectManager { } - #endregion - - #region Properties - public ITestObjectDao TestObjectDao { get { return testObjectDao; } set { testObjectDao = value; } } - #endregion - - #region Methods - [Transaction] public void SaveTwoTestObjects(TestObject to1, TestObject to2) { @@ -96,6 +74,4 @@ public class TestObjectManager : ITestObjectManager } } } - - #endregion } \ No newline at end of file diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectQuery.cs b/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectQuery.cs index d82bdd28..5e7c9a86 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectQuery.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectQuery.cs @@ -1,5 +1,3 @@ -#region Licence - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Data; using Spring.Data.Common; using Spring.Data.Objects; using Spring.Objects; -#endregion - namespace Spring.Data; /// diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectStoredProcedure.cs b/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectStoredProcedure.cs index 23920dc5..121fe8c1 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectStoredProcedure.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectStoredProcedure.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using Spring.Data.Common; using Spring.Data.Objects; -#endregion - namespace Spring.Data; /// diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/TestTxIsolationLevelTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/TestTxIsolationLevelTests.cs index 17333bb6..7c341631 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/TestTxIsolationLevelTests.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/TestTxIsolationLevelTests.cs @@ -1,5 +1,3 @@ -#region Licence - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Data.SqlClient; using System.Transactions; using NUnit.Framework; @@ -27,8 +21,6 @@ using Spring.Context; using Spring.Context.Support; using Spring.Objects; -#endregion - namespace Spring.Data; /// diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/TransactionTemplateTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/TransactionTemplateTests.cs index 7ac0b6c9..c032f4bf 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/TransactionTemplateTests.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/TransactionTemplateTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Data; using NUnit.Framework; using Spring.Context; @@ -30,8 +24,6 @@ using Spring.Objects; using Spring.Transaction; using Spring.Transaction.Support; -#endregion - namespace Spring.Data; /// diff --git a/test/Spring/Spring.Data.Integration.Tests/ProviderNameSource.cs b/test/Spring/Spring.Data.Integration.Tests/ProviderNameSource.cs index c4f8fab2..716e2afa 100644 --- a/test/Spring/Spring.Data.Integration.Tests/ProviderNameSource.cs +++ b/test/Spring/Spring.Data.Integration.Tests/ProviderNameSource.cs @@ -1,6 +1,4 @@ -#region License - -// /* +// /* // * Copyright 2018 the original author or authors. // * // * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,14 +14,8 @@ // * limitations under the License. // */ -#endregion - -#region using - using Spring.Objects.Factory.Config; -#endregion - namespace Spring; public class ProviderNameSource : IVariableSource diff --git a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/AccountController.cs b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/AccountController.cs index 97f04b6f..1f75f5f7 100644 --- a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/AccountController.cs +++ b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/AccountController.cs @@ -10,13 +10,11 @@ namespace Spring.Data.NHibernate set { accountManager = value; } } - #region Implementation of IAccountController - public void DoWork() { accountManager.DoTransfer(30, 30); } - #endregion + } } diff --git a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/AccountManager.cs b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/AccountManager.cs index ed3f142e..5ecdb89a 100644 --- a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/AccountManager.cs +++ b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/AccountManager.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Transaction.Interceptor; namespace Spring.Data.NHibernate diff --git a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/Credit.cs b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/Credit.cs index cab4a18a..c67f865f 100644 --- a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/Credit.cs +++ b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/Credit.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,21 +14,13 @@ * limitations under the License. */ -#endregion - namespace Spring.Data.NHibernate { public class Credit { - #region Fields - private int creditId; private float amount; - #endregion - - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -38,10 +28,6 @@ namespace Spring.Data.NHibernate { } - #endregion - - #region Properties - public int CreditID { get { return creditId; } @@ -54,10 +40,10 @@ namespace Spring.Data.NHibernate set { amount = value; } } - #endregion + - #region Methods + - #endregion + } } diff --git a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/DbProviderTemplateTests.cs b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/DbProviderTemplateTests.cs index cc522753..c7198e13 100644 --- a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/DbProviderTemplateTests.cs +++ b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/DbProviderTemplateTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Context; using Spring.Context.Support; using Spring.Data.Common; -#endregion - namespace Spring.Data.NHibernate { /// diff --git a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/Debit.cs b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/Debit.cs index 3ee2a9e0..68f2bcaf 100644 --- a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/Debit.cs +++ b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/Debit.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,21 +14,13 @@ * limitations under the License. */ -#endregion - namespace Spring.Data.NHibernate { public class Debit { - #region Fields - private int debitId; private float amount; - #endregion - - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -38,10 +28,6 @@ namespace Spring.Data.NHibernate { } - #endregion - - #region Properties - public int DebitID { get { return debitId; } @@ -54,10 +40,10 @@ namespace Spring.Data.NHibernate set { amount = value; } } - #endregion + - #region Methods + - #endregion + } } diff --git a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/HibernateTxScopeTransactionManagerTests.cs b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/HibernateTxScopeTransactionManagerTests.cs index b3625aff..111bba8f 100644 --- a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/HibernateTxScopeTransactionManagerTests.cs +++ b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/HibernateTxScopeTransactionManagerTests.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Data; using NHibernate; using NUnit.Framework; @@ -33,8 +27,6 @@ using Spring.Core.IO; using NHibernate.Cfg; using System.Diagnostics; -#endregion - namespace Spring.Data.NHibernate { /// diff --git a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/IAuditDao.cs b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/IAuditDao.cs index 63349547..fb17abcd 100644 --- a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/IAuditDao.cs +++ b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/IAuditDao.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Data.NHibernate { public interface IAuditDao diff --git a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/ITestObjectDao.cs b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/ITestObjectDao.cs index d0d14a2b..63ecb2d4 100644 --- a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/ITestObjectDao.cs +++ b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/ITestObjectDao.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Data.NHibernate { /// diff --git a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/MultipleDbTests.cs b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/MultipleDbTests.cs index a9adfebd..c8d7f7fe 100644 --- a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/MultipleDbTests.cs +++ b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/MultipleDbTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using NHibernate; using NUnit.Framework; using Spring.Context; using Spring.Context.Support; using Spring.Data.NHibernate.Support; -#endregion - namespace Spring.Data.NHibernate { /// @@ -38,14 +30,8 @@ namespace Spring.Data.NHibernate [Ignore("Trouble running on Appveyor")] public class MultipleDbTests { - #region Fields - private IApplicationContext ctx; - #endregion - - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -53,8 +39,6 @@ namespace Spring.Data.NHibernate { } - #endregion - [SetUp] public void SetUp() { diff --git a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/NHDAOTests.cs b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/NHDAOTests.cs index 13ec80c9..b5812d7b 100644 --- a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/NHDAOTests.cs +++ b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/NHDAOTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using NHibernate; using NUnit.Framework; using Spring.Context; @@ -27,8 +21,6 @@ using Spring.Context.Support; using Spring.Data.Common; using Spring.Data.NHibernate.Support; -#endregion - namespace Spring.Data.NHibernate { [TestFixture] diff --git a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/NHTestObjectDao.cs b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/NHTestObjectDao.cs index cfaedf8e..05b9340a 100644 --- a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/NHTestObjectDao.cs +++ b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/NHTestObjectDao.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,23 +14,15 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using NHibernate.Type; using Spring.Data.NHibernate.Support; using Spring.Transaction.Interceptor; -#endregion - namespace Spring.Data.NHibernate { public class NHTestObjectDao : HibernateDaoSupport, ITestObjectDao { - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -40,10 +30,6 @@ namespace Spring.Data.NHibernate { } - #endregion - - #region ITestObjectDao Members - [Transaction()] public void Create(TestObject to) { @@ -88,6 +74,6 @@ namespace Spring.Data.NHibernate throw new Exception("My expected exception for test purposes."); } - #endregion + } } diff --git a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/NativeNHTestObjectDao.cs b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/NativeNHTestObjectDao.cs index 4a37c39a..d5097981 100644 --- a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/NativeNHTestObjectDao.cs +++ b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/NativeNHTestObjectDao.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NHibernate; -#endregion - namespace Spring.Data.NHibernate { public class NativeNHTestObjectDao : ITestObjectDao @@ -36,8 +28,6 @@ namespace Spring.Data.NHibernate private ISessionFactory sessionFactory; - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -45,14 +35,6 @@ namespace Spring.Data.NHibernate { } - #endregion - - #region Methods - - #endregion - - #region ITestObjectDao Members - public void Create(TestObject to) { ISession session = null; @@ -102,6 +84,6 @@ namespace Spring.Data.NHibernate // TODO: Add NativeNHTestObjectDao.CreateUpdateRollback implementation } - #endregion + } } diff --git a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/NativeNHTests.cs b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/NativeNHTests.cs index 3fec34e4..2e76ba37 100644 --- a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/NativeNHTests.cs +++ b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/NativeNHTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,23 +14,15 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Context; using Spring.Context.Support; -#endregion - namespace Spring.Data.NHibernate { [TestFixture] public class NativeNHTests { - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -40,10 +30,6 @@ namespace Spring.Data.NHibernate { } - #endregion - - #region Methods - [Test] public void CreateNative() { @@ -59,6 +45,6 @@ namespace Spring.Data.NHibernate dao.Create(toGeorge); } - #endregion + } } diff --git a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/TemplateTests.cs b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/TemplateTests.cs index 83f1be27..6354ed8d 100644 --- a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/TemplateTests.cs +++ b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/TemplateTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Data; using NHibernate; using NUnit.Framework; @@ -30,8 +24,6 @@ using Spring.Data.Support; using Spring.Transaction; using Spring.Transaction.Support; -#endregion - namespace Spring.Data.NHibernate { /// @@ -41,18 +33,12 @@ namespace Spring.Data.NHibernate [TestFixture] public class TemplateTests { - #region Fields - private IDbProvider dbProvider; private IPlatformTransactionManager transactionManager; private IApplicationContext ctx; - #endregion - - #region Constants - /// /// The shared instance for this class (and derived classes). /// @@ -62,10 +48,6 @@ namespace Spring.Data.NHibernate // force Spring.Data.NHibernate to be preloaded by runtime private Type TLocalSessionFactoryObject = typeof(LocalSessionFactoryObject); - #endregion - - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -73,8 +55,6 @@ namespace Spring.Data.NHibernate { } - #endregion - [SetUp] public void SetUp() { diff --git a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/TestObject.cs b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/TestObject.cs index 4a3ae518..837d50a2 100644 --- a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/TestObject.cs +++ b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/TestObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Data.NHibernate { /// @@ -26,16 +22,10 @@ namespace Spring.Data.NHibernate /// Mark Pollack (.NET) public class TestObject { - #region Fields - private int age; private string name; private int objectNumber; - #endregion - - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -43,10 +33,6 @@ namespace Spring.Data.NHibernate { } - #endregion - - #region Properties - public virtual int Age { get { return age; } @@ -65,10 +51,10 @@ namespace Spring.Data.NHibernate set { objectNumber = value; } } - #endregion + - #region Methods + - #endregion + } } diff --git a/test/Spring/Spring.Data.NHibernate5.NestedTxSuspension.Integration.Tests/HibernateTxScopeTransactionManagerNestedTransactionSuspensionTests.cs b/test/Spring/Spring.Data.NHibernate5.NestedTxSuspension.Integration.Tests/HibernateTxScopeTransactionManagerNestedTransactionSuspensionTests.cs index babe9c16..83fef067 100644 --- a/test/Spring/Spring.Data.NHibernate5.NestedTxSuspension.Integration.Tests/HibernateTxScopeTransactionManagerNestedTransactionSuspensionTests.cs +++ b/test/Spring/Spring.Data.NHibernate5.NestedTxSuspension.Integration.Tests/HibernateTxScopeTransactionManagerNestedTransactionSuspensionTests.cs @@ -6,13 +6,9 @@ namespace Spring.Data.NHibernate5.NestedTxSuspension.Integration.Tests; [TestFixture] public class HibernateTxScopeTransactionManagerNestedTransactionSuspensionTests : AbstractTransactionalSpringContextTests { - #region DI - public IService1 Service1 { get; set; } public IService2 Service2 { get; set; } - #endregion - protected override string[] ConfigLocations { get diff --git a/test/Spring/Spring.Data.NHibernate5.NestedTxSuspension.Integration.Tests/Service1.cs b/test/Spring/Spring.Data.NHibernate5.NestedTxSuspension.Integration.Tests/Service1.cs index c7451379..409d5e9e 100644 --- a/test/Spring/Spring.Data.NHibernate5.NestedTxSuspension.Integration.Tests/Service1.cs +++ b/test/Spring/Spring.Data.NHibernate5.NestedTxSuspension.Integration.Tests/Service1.cs @@ -6,12 +6,8 @@ namespace Spring.Data.NHibernate5.NestedTxSuspension.Integration.Tests; [Transaction.Interceptor.Transaction(TransactionPropagation.Supports, ReadOnly = true)] public class Service1 : IService1 { - #region DI - public HibernateTemplate HibernateTemplate { get; set; } - #endregion - [Transaction.Interceptor.Transaction(TransactionPropagation.NotSupported)] public virtual void ServiceMethodWithNotSupported1() { diff --git a/test/Spring/Spring.Data.NHibernate5.NestedTxSuspension.Integration.Tests/Service2.cs b/test/Spring/Spring.Data.NHibernate5.NestedTxSuspension.Integration.Tests/Service2.cs index dc5e191e..929cd257 100644 --- a/test/Spring/Spring.Data.NHibernate5.NestedTxSuspension.Integration.Tests/Service2.cs +++ b/test/Spring/Spring.Data.NHibernate5.NestedTxSuspension.Integration.Tests/Service2.cs @@ -6,12 +6,8 @@ namespace Spring.Data.NHibernate5.NestedTxSuspension.Integration.Tests; [Transaction.Interceptor.Transaction(TransactionPropagation.Supports, ReadOnly = true)] public class Service2 : IService2 { - #region DI - public HibernateTemplate HibernateTemplate { get; set; } - #endregion - [Transaction.Interceptor.Transaction(TransactionPropagation.NotSupported)] public virtual void ServiceMethodWithNotSupported() { diff --git a/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/Config/AopConfiguration.cs b/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/Config/AopConfiguration.cs index feeaf94a..c5d8e809 100644 --- a/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/Config/AopConfiguration.cs +++ b/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/Config/AopConfiguration.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Aop.Framework; using Spring.Context; using Spring.Context.Support; using Spring.Transaction; -#endregion - namespace Spring.Data.NHibernate.Config { /// diff --git a/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/ITestObjectDao.cs b/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/ITestObjectDao.cs index d0d14a2b..63ecb2d4 100644 --- a/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/ITestObjectDao.cs +++ b/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/ITestObjectDao.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Data.NHibernate { /// diff --git a/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/LocalSessionFactoryObjectTests.cs b/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/LocalSessionFactoryObjectTests.cs index f30658e2..d83d43a6 100644 --- a/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/LocalSessionFactoryObjectTests.cs +++ b/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/LocalSessionFactoryObjectTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NHibernate; using NHibernate.Connection; using NHibernate.Dialect; diff --git a/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/NHTestObjectDao.cs b/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/NHTestObjectDao.cs index 3fa2988f..12e37917 100644 --- a/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/NHTestObjectDao.cs +++ b/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/NHTestObjectDao.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using NHibernate.Type; using Spring.Data.NHibernate.Support; -#endregion - namespace Spring.Data.NHibernate { /// @@ -34,8 +26,6 @@ namespace Spring.Data.NHibernate /// Mark Pollack (.NET) public class TestObjectDao : HibernateDaoSupport, ITestObjectDao { - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -43,10 +33,6 @@ namespace Spring.Data.NHibernate { } - #endregion - - #region ITestObjectDao Members - public void Create(TestObject to) { //HibernateTemplate.Save(to); @@ -88,6 +74,6 @@ namespace Spring.Data.NHibernate throw new Exception("My expected exception for test purposes."); } - #endregion + } } diff --git a/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/SessionFactoryUtilsTests.cs b/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/SessionFactoryUtilsTests.cs index 99df40b9..e8a60df8 100644 --- a/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/SessionFactoryUtilsTests.cs +++ b/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/SessionFactoryUtilsTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data.SqlClient; using FakeItEasy; using NHibernate.Connection; diff --git a/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/SimpleService.cs b/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/SimpleService.cs index fcb39653..c3645056 100644 --- a/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/SimpleService.cs +++ b/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/SimpleService.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Transaction.Interceptor; namespace Spring.Data.NHibernate diff --git a/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/Support/ConfigSectionSessionScopeSettingsTests.cs b/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/Support/ConfigSectionSessionScopeSettingsTests.cs index f338e500..360adb77 100644 --- a/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/Support/ConfigSectionSessionScopeSettingsTests.cs +++ b/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/Support/ConfigSectionSessionScopeSettingsTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using FakeItEasy; using NHibernate; using NUnit.Framework; using Spring.Context.Support; using Spring.Objects.Factory.Config; -#endregion - namespace Spring.Data.NHibernate.Support { /// diff --git a/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/Support/SessionScopeSettingsTests.cs b/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/Support/SessionScopeSettingsTests.cs index 93e210c8..44b7a1be 100644 --- a/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/Support/SessionScopeSettingsTests.cs +++ b/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/Support/SessionScopeSettingsTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using FakeItEasy; using NHibernate; using NUnit.Framework; diff --git a/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/Support/SessionScopeTests.cs b/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/Support/SessionScopeTests.cs index 0de49231..0a4c7eba 100644 --- a/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/Support/SessionScopeTests.cs +++ b/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/Support/SessionScopeTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using FakeItEasy; using NHibernate; using NUnit.Framework; using Spring.Transaction.Support; using static FakeItEasy.A; -#endregion - namespace Spring.Data.NHibernate.Support { /// diff --git a/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/TestObject.cs b/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/TestObject.cs index 4a3ae518..837d50a2 100644 --- a/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/TestObject.cs +++ b/test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/TestObject.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Data.NHibernate { /// @@ -26,16 +22,10 @@ namespace Spring.Data.NHibernate /// Mark Pollack (.NET) public class TestObject { - #region Fields - private int age; private string name; private int objectNumber; - #endregion - - #region Constructor (s) - /// /// Initializes a new instance of the class. /// @@ -43,10 +33,6 @@ namespace Spring.Data.NHibernate { } - #endregion - - #region Properties - public virtual int Age { get { return age; } @@ -65,10 +51,10 @@ namespace Spring.Data.NHibernate set { objectNumber = value; } } - #endregion + - #region Methods + - #endregion + } } diff --git a/test/Spring/Spring.Data.NHibernate5.Tests/HibernateCompilerOptionsTests.cs b/test/Spring/Spring.Data.NHibernate5.Tests/HibernateCompilerOptionsTests.cs index e180c7d5..380004f5 100644 --- a/test/Spring/Spring.Data.NHibernate5.Tests/HibernateCompilerOptionsTests.cs +++ b/test/Spring/Spring.Data.NHibernate5.Tests/HibernateCompilerOptionsTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004-2009 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; using Spring.Data.NHibernate; -#endregion - namespace Spring; /// Test that the assembly is built with the correct DebugAttributes in release and debug builds. diff --git a/test/Spring/Spring.Data.NHibernate5.Tests/HibernateExceptionTests.cs b/test/Spring/Spring.Data.NHibernate5.Tests/HibernateExceptionTests.cs index 36174f67..b4ea65e7 100644 --- a/test/Spring/Spring.Data.NHibernate5.Tests/HibernateExceptionTests.cs +++ b/test/Spring/Spring.Data.NHibernate5.Tests/HibernateExceptionTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; using Spring.Data.NHibernate; -#endregion - namespace Spring; /// diff --git a/test/Spring/Spring.Data.Tests/Dao/Attributes/PersistenceExceptionTranslationAdvisorTests.cs b/test/Spring/Spring.Data.Tests/Dao/Attributes/PersistenceExceptionTranslationAdvisorTests.cs index ee331ad9..d232be8d 100644 --- a/test/Spring/Spring.Data.Tests/Dao/Attributes/PersistenceExceptionTranslationAdvisorTests.cs +++ b/test/Spring/Spring.Data.Tests/Dao/Attributes/PersistenceExceptionTranslationAdvisorTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; using NUnit.Framework; using Spring.Aop.Framework; @@ -199,8 +195,6 @@ public interface IRepositoryInterface [Serializable] public class PersistenceException : ApplicationException { - #region Constructor (s) / Destructor - public PersistenceException() { } @@ -220,6 +214,4 @@ public class PersistenceException : ApplicationException : base(info, context) { } - - #endregion } diff --git a/test/Spring/Spring.Data.Tests/Dao/Attributes/PersistenceExceptionTranslationInterceptorTests.cs b/test/Spring/Spring.Data.Tests/Dao/Attributes/PersistenceExceptionTranslationInterceptorTests.cs index 8c0b6ce9..d84d4a34 100644 --- a/test/Spring/Spring.Data.Tests/Dao/Attributes/PersistenceExceptionTranslationInterceptorTests.cs +++ b/test/Spring/Spring.Data.Tests/Dao/Attributes/PersistenceExceptionTranslationInterceptorTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Aop.Framework; using Spring.Dao.Support; using Spring.Objects.Factory.Support; using Spring.Stereotype; using Spring.Util; -#endregion - namespace Spring.Dao.Attributes; /// diff --git a/test/Spring/Spring.Data.Tests/Dao/Attributes/PersistenceExceptionTranslationPostProcessorTests.cs b/test/Spring/Spring.Data.Tests/Dao/Attributes/PersistenceExceptionTranslationPostProcessorTests.cs index d45b7ccb..7f64e9be 100644 --- a/test/Spring/Spring.Data.Tests/Dao/Attributes/PersistenceExceptionTranslationPostProcessorTests.cs +++ b/test/Spring/Spring.Data.Tests/Dao/Attributes/PersistenceExceptionTranslationPostProcessorTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Aop; using Spring.Aop.Framework; @@ -28,8 +22,6 @@ using Spring.Dao.Support; using Spring.Objects; using Spring.Objects.Factory.Support; -#endregion - namespace Spring.Dao.Attributes; /// diff --git a/test/Spring/Spring.Data.Tests/Dao/Support/DataAccessUtilsTests.cs b/test/Spring/Spring.Data.Tests/Dao/Support/DataAccessUtilsTests.cs index e5591b69..13e1ddef 100644 --- a/test/Spring/Spring.Data.Tests/Dao/Support/DataAccessUtilsTests.cs +++ b/test/Spring/Spring.Data.Tests/Dao/Support/DataAccessUtilsTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using NUnit.Framework; -#endregion - namespace Spring.Dao.Support; /// @@ -48,8 +40,6 @@ public class DataAccessUtilsTests public class MapPersistenceExceptionTranslator : IPersistenceExceptionTranslator { - #region IPersistenceExceptionTranslator Members - private IDictionary translations = new Hashtable(); public void AddTranslation(Exception inException, Exception outException) @@ -61,6 +51,4 @@ public class MapPersistenceExceptionTranslator : IPersistenceExceptionTranslator { return (DataAccessException) translations[ex]; } - - #endregion } diff --git a/test/Spring/Spring.Data.Tests/Data/AutoDeclarativeTxTests.cs b/test/Spring/Spring.Data.Tests/Data/AutoDeclarativeTxTests.cs index 5155d97f..103b2eea 100644 --- a/test/Spring/Spring.Data.Tests/Data/AutoDeclarativeTxTests.cs +++ b/test/Spring/Spring.Data.Tests/Data/AutoDeclarativeTxTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Aop.Framework; using Spring.Context; @@ -27,8 +21,6 @@ using Spring.Context.Support; using Spring.Objects; using Spring.Transaction; -#endregion - namespace Spring.Data; /// diff --git a/test/Spring/Spring.Data.Tests/Data/Common/DbParametersTests.cs b/test/Spring/Spring.Data.Tests/Data/Common/DbParametersTests.cs index d1b6a6d6..01be5afe 100644 --- a/test/Spring/Spring.Data.Tests/Data/Common/DbParametersTests.cs +++ b/test/Spring/Spring.Data.Tests/Data/Common/DbParametersTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Data; using NUnit.Framework; -#endregion - namespace Spring.Data.Common; /// diff --git a/test/Spring/Spring.Data.Tests/Data/Common/DbProviderFactoryTests.cs b/test/Spring/Spring.Data.Tests/Data/Common/DbProviderFactoryTests.cs index 3bbf0aa5..c07d1f1b 100644 --- a/test/Spring/Spring.Data.Tests/Data/Common/DbProviderFactoryTests.cs +++ b/test/Spring/Spring.Data.Tests/Data/Common/DbProviderFactoryTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using NUnit.Framework; using Spring.Context; @@ -33,8 +29,6 @@ namespace Spring.Data.Common; [TestFixture] public class DbProviderFactoryTests { - #region Helper classes for threading tests - public class AsyncTestDbProviderFactory : AsyncTestTask { private readonly string providerName; @@ -52,8 +46,6 @@ public class DbProviderFactoryTests } } - #endregion - private IApplicationContext ctx; [SetUp] diff --git a/test/Spring/Spring.Data.Tests/Data/Common/MultiDelegatingDbProviderTests.cs b/test/Spring/Spring.Data.Tests/Data/Common/MultiDelegatingDbProviderTests.cs index ee083020..bd0307a5 100644 --- a/test/Spring/Spring.Data.Tests/Data/Common/MultiDelegatingDbProviderTests.cs +++ b/test/Spring/Spring.Data.Tests/Data/Common/MultiDelegatingDbProviderTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Data; using System.Data.Common; diff --git a/test/Spring/Spring.Data.Tests/Data/Common/UserCredentialsDbProviderTests.cs b/test/Spring/Spring.Data.Tests/Data/Common/UserCredentialsDbProviderTests.cs index cc07bd31..282a3f03 100644 --- a/test/Spring/Spring.Data.Tests/Data/Common/UserCredentialsDbProviderTests.cs +++ b/test/Spring/Spring.Data.Tests/Data/Common/UserCredentialsDbProviderTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; using FakeItEasy; using NUnit.Framework; diff --git a/test/Spring/Spring.Data.Tests/Data/Core/TxScopeTransactionManagerIntegrationTests.cs b/test/Spring/Spring.Data.Tests/Data/Core/TxScopeTransactionManagerIntegrationTests.cs index da657b5d..c8d551bc 100644 --- a/test/Spring/Spring.Data.Tests/Data/Core/TxScopeTransactionManagerIntegrationTests.cs +++ b/test/Spring/Spring.Data.Tests/Data/Core/TxScopeTransactionManagerIntegrationTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using FakeItEasy; using NUnit.Framework; using Spring.Transaction; diff --git a/test/Spring/Spring.Data.Tests/Data/Core/TxScopeTransactionManagerTests.cs b/test/Spring/Spring.Data.Tests/Data/Core/TxScopeTransactionManagerTests.cs index d5a97077..0de391ea 100644 --- a/test/Spring/Spring.Data.Tests/Data/Core/TxScopeTransactionManagerTests.cs +++ b/test/Spring/Spring.Data.Tests/Data/Core/TxScopeTransactionManagerTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Transactions; using FakeItEasy; using NUnit.Framework; diff --git a/test/Spring/Spring.Data.Tests/Data/Objects/AbstractAdoQueryTests.cs b/test/Spring/Spring.Data.Tests/Data/Objects/AbstractAdoQueryTests.cs index 80ef6949..c7b6332a 100644 --- a/test/Spring/Spring.Data.Tests/Data/Objects/AbstractAdoQueryTests.cs +++ b/test/Spring/Spring.Data.Tests/Data/Objects/AbstractAdoQueryTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; using FakeItEasy; using Spring.Data.Common; diff --git a/test/Spring/Spring.Data.Tests/Data/Objects/AdoOperationTests.cs b/test/Spring/Spring.Data.Tests/Data/Objects/AdoOperationTests.cs index 0334720d..c007c9b1 100644 --- a/test/Spring/Spring.Data.Tests/Data/Objects/AdoOperationTests.cs +++ b/test/Spring/Spring.Data.Tests/Data/Objects/AdoOperationTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -36,16 +30,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Dao; using Spring.Data.Common; -#endregion - namespace Spring.Data.Objects; /// diff --git a/test/Spring/Spring.Data.Tests/Data/Objects/AdoQueryTests.cs b/test/Spring/Spring.Data.Tests/Data/Objects/AdoQueryTests.cs index ea72ae77..4e9f9cbd 100644 --- a/test/Spring/Spring.Data.Tests/Data/Objects/AdoQueryTests.cs +++ b/test/Spring/Spring.Data.Tests/Data/Objects/AdoQueryTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -36,10 +30,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Data; using System.Data.SqlClient; @@ -48,8 +38,6 @@ using NUnit.Framework; using Spring.Dao; using Spring.Data.Common; -#endregion - namespace Spring.Data.Objects; /// diff --git a/test/Spring/Spring.Data.Tests/Data/Objects/StoredProcedureTests.cs b/test/Spring/Spring.Data.Tests/Data/Objects/StoredProcedureTests.cs index fe663044..d7dda674 100644 --- a/test/Spring/Spring.Data.Tests/Data/Objects/StoredProcedureTests.cs +++ b/test/Spring/Spring.Data.Tests/Data/Objects/StoredProcedureTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -36,8 +30,6 @@ * limitations under the License. */ -#endregion - using System.Data; using System.Data.SqlClient; using FakeItEasy; diff --git a/test/Spring/Spring.Data.Tests/Data/TestCoord.cs b/test/Spring/Spring.Data.Tests/Data/TestCoord.cs index 99236d5f..bfabe3f7 100644 --- a/test/Spring/Spring.Data.Tests/Data/TestCoord.cs +++ b/test/Spring/Spring.Data.Tests/Data/TestCoord.cs @@ -12,12 +12,8 @@ public class TestCoord : ITestCoord set { testObjectMgr = value; } } - #region ITestCoordinator Members - public void WorkOn(TestObject to1, TestObject to2) { testObjectMgr.SaveTwoTestObjects(to1, to2); } - - #endregion } diff --git a/test/Spring/Spring.Data.Tests/DataCompilerOptionsTests.cs b/test/Spring/Spring.Data.Tests/DataCompilerOptionsTests.cs index ea488947..d9eb8453 100644 --- a/test/Spring/Spring.Data.Tests/DataCompilerOptionsTests.cs +++ b/test/Spring/Spring.Data.Tests/DataCompilerOptionsTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004-2009 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; using Spring.Transaction; -#endregion - namespace Spring; /// Test that the assembly is built with the correct DebugAttributes in release and debug builds. diff --git a/test/Spring/Spring.Data.Tests/DataExceptionTests.cs b/test/Spring/Spring.Data.Tests/DataExceptionTests.cs index 6ae8bb3f..12693feb 100644 --- a/test/Spring/Spring.Data.Tests/DataExceptionTests.cs +++ b/test/Spring/Spring.Data.Tests/DataExceptionTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; -#endregion - namespace Spring; /// diff --git a/test/Spring/Spring.Data.Tests/Support/TestDbProvider.cs b/test/Spring/Spring.Data.Tests/Support/TestDbProvider.cs index 7250bb9e..4c73bec5 100644 --- a/test/Spring/Spring.Data.Tests/Support/TestDbProvider.cs +++ b/test/Spring/Spring.Data.Tests/Support/TestDbProvider.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Data; using Spring.Data.Common; -#endregion - namespace Spring.Support; /// @@ -150,12 +142,8 @@ public class TestDbProvider : IDbProvider } } - #region Stub method to set behavior - public IDbConnection ConnectionToCreate { set { connection = value; } } - - #endregion } diff --git a/test/Spring/Spring.Data.Tests/Support/TestSqlException.cs b/test/Spring/Spring.Data.Tests/Support/TestSqlException.cs index d890010d..1ce882e0 100644 --- a/test/Spring/Spring.Data.Tests/Support/TestSqlException.cs +++ b/test/Spring/Spring.Data.Tests/Support/TestSqlException.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Runtime.Serialization; #pragma warning disable CS0672 // Member overrides obsolete member diff --git a/test/Spring/Spring.Data.Tests/Transaction/CallCountingTransactionManager.cs b/test/Spring/Spring.Data.Tests/Transaction/CallCountingTransactionManager.cs index 710bd9a2..0f768f5d 100644 --- a/test/Spring/Spring.Data.Tests/Transaction/CallCountingTransactionManager.cs +++ b/test/Spring/Spring.Data.Tests/Transaction/CallCountingTransactionManager.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Transaction.Support; namespace Spring.Transaction; diff --git a/test/Spring/Spring.Data.Tests/Transaction/Config/TxNamespaceParserTests.cs b/test/Spring/Spring.Data.Tests/Transaction/Config/TxNamespaceParserTests.cs index b3dd9d1e..17389114 100644 --- a/test/Spring/Spring.Data.Tests/Transaction/Config/TxNamespaceParserTests.cs +++ b/test/Spring/Spring.Data.Tests/Transaction/Config/TxNamespaceParserTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; using Spring.Aop.Config; @@ -31,8 +25,6 @@ using Spring.Objects.Factory.Support; using Spring.Objects.Factory.Xml; using Spring.Transaction.Interceptor; -#endregion - namespace Spring.Transaction.Config; [TestFixture] diff --git a/test/Spring/Spring.Data.Tests/Transaction/Interceptor/AbstractTransactionAspectTests.cs b/test/Spring/Spring.Data.Tests/Transaction/Interceptor/AbstractTransactionAspectTests.cs index 3b52eb6a..975bb1b7 100644 --- a/test/Spring/Spring.Data.Tests/Transaction/Interceptor/AbstractTransactionAspectTests.cs +++ b/test/Spring/Spring.Data.Tests/Transaction/Interceptor/AbstractTransactionAspectTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; using FakeItEasy; using NUnit.Framework; diff --git a/test/Spring/Spring.Data.Tests/Transaction/Interceptor/RollbackRuleAttributeTests.cs b/test/Spring/Spring.Data.Tests/Transaction/Interceptor/RollbackRuleAttributeTests.cs index 439f19af..a7a6856f 100644 --- a/test/Spring/Spring.Data.Tests/Transaction/Interceptor/RollbackRuleAttributeTests.cs +++ b/test/Spring/Spring.Data.Tests/Transaction/Interceptor/RollbackRuleAttributeTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; using System.Text; using NUnit.Framework; diff --git a/test/Spring/Spring.Data.Tests/Transaction/Interceptor/TransactionAttributeSourceTests.cs b/test/Spring/Spring.Data.Tests/Transaction/Interceptor/TransactionAttributeSourceTests.cs index aac95f60..b739efc1 100644 --- a/test/Spring/Spring.Data.Tests/Transaction/Interceptor/TransactionAttributeSourceTests.cs +++ b/test/Spring/Spring.Data.Tests/Transaction/Interceptor/TransactionAttributeSourceTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Collections.Specialized; using NUnit.Framework; -#endregion - namespace Spring.Transaction.Interceptor; /// diff --git a/test/Spring/Spring.Data.Tests/Transaction/Interceptor/TransactionInterceptorTests.cs b/test/Spring/Spring.Data.Tests/Transaction/Interceptor/TransactionInterceptorTests.cs index 05f83c55..f46d2268 100644 --- a/test/Spring/Spring.Data.Tests/Transaction/Interceptor/TransactionInterceptorTests.cs +++ b/test/Spring/Spring.Data.Tests/Transaction/Interceptor/TransactionInterceptorTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Aop.Framework; -#endregion - namespace Spring.Transaction.Interceptor; /// diff --git a/test/Spring/Spring.Messaging.Ems.Integration.Tests/Messaging/Ems/Config/EmsNamespaceHandlerTests.cs b/test/Spring/Spring.Messaging.Ems.Integration.Tests/Messaging/Ems/Config/EmsNamespaceHandlerTests.cs index ea46bcf1..69e9259b 100644 --- a/test/Spring/Spring.Messaging.Ems.Integration.Tests/Messaging/Ems/Config/EmsNamespaceHandlerTests.cs +++ b/test/Spring/Spring.Messaging.Ems.Integration.Tests/Messaging/Ems/Config/EmsNamespaceHandlerTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Context; using Spring.Context.Support; @@ -27,8 +21,6 @@ using Spring.Messaging.Ems.Common; using Spring.Messaging.Ems.Listener; using Spring.Objects.Factory.Xml; -#endregion - namespace Spring.Messaging.Ems.Config; /// diff --git a/test/Spring/Spring.Messaging.Ems.Integration.Tests/Messaging/Ems/Connections/TestMessageListener.cs b/test/Spring/Spring.Messaging.Ems.Integration.Tests/Messaging/Ems/Connections/TestMessageListener.cs index ab607875..bdc60c25 100644 --- a/test/Spring/Spring.Messaging.Ems.Integration.Tests/Messaging/Ems/Connections/TestMessageListener.cs +++ b/test/Spring/Spring.Messaging.Ems.Integration.Tests/Messaging/Ems/Connections/TestMessageListener.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Messaging.Ems.Connections; /// @@ -37,12 +33,8 @@ public class TestMessageListener : IMessageListener set { message = value; } } - #region IMessageListener Members - public void OnMessage(Message message) { this.message = "Test1"; } - - #endregion } diff --git a/test/Spring/Spring.Messaging.Ems.Integration.Tests/Messaging/Ems/Core/EmsTemplateTests.cs b/test/Spring/Spring.Messaging.Ems.Integration.Tests/Messaging/Ems/Core/EmsTemplateTests.cs index 730f1670..0a80a3ea 100644 --- a/test/Spring/Spring.Messaging.Ems.Integration.Tests/Messaging/Ems/Core/EmsTemplateTests.cs +++ b/test/Spring/Spring.Messaging.Ems.Integration.Tests/Messaging/Ems/Core/EmsTemplateTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2010 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using NUnit.Framework; using Spring.Messaging.Ems.Common; using Spring.Testing.NUnit; -#endregion - namespace Spring.Messaging.Ems.Core; [TestFixture] @@ -119,8 +111,6 @@ public class EmsTemplateTests : AbstractDependencyInjectionSpringContextTests Assert.AreEqual(msgText, text); } - #region Overrides of AbstractDependencyInjectionSpringContextTests - /// /// Subclasses must implement this property to return the locations of their /// config files. A plain path will be treated as a file system location. @@ -130,6 +120,4 @@ public class EmsTemplateTests : AbstractDependencyInjectionSpringContextTests { get { return new string[] { "assembly://Spring.Messaging.Ems.Integration.Tests/Spring.Messaging.Ems.Core/EmsTemplateTests.xml" }; } } - - #endregion } diff --git a/test/Spring/Spring.Messaging.Ems.Integration.Tests/Messaging/Ems/Listener/SimpleMessageListenerContainerTests.cs b/test/Spring/Spring.Messaging.Ems.Integration.Tests/Messaging/Ems/Listener/SimpleMessageListenerContainerTests.cs index 103f1c39..bb8c692d 100644 --- a/test/Spring/Spring.Messaging.Ems.Integration.Tests/Messaging/Ems/Listener/SimpleMessageListenerContainerTests.cs +++ b/test/Spring/Spring.Messaging.Ems.Integration.Tests/Messaging/Ems/Listener/SimpleMessageListenerContainerTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Messaging.Ems.Core; using Spring.Testing.NUnit; @@ -52,12 +48,8 @@ public class SimpleMessageListenerContainerTests : AbstractDependencyInjectionSp Assert.AreEqual(1, simpleMessageListener.MessageCount); } - #region Overrides of AbstractDependencyInjectionSpringContextTests - protected override string[] ConfigLocations { get { return new string[] { "assembly://Spring.Messaging.Ems.Integration.Tests/Spring.Messaging.Ems.Listener/SimpleMessageListenerContainerTests.xml" }; } } - - #endregion } diff --git a/test/Spring/Spring.Messaging.Nms.Integration.Tests/Messaging/Nms/Core/NmsTemplateTests.cs b/test/Spring/Spring.Messaging.Nms.Integration.Tests/Messaging/Nms/Core/NmsTemplateTests.cs index ef32e2ca..a1936eed 100644 --- a/test/Spring/Spring.Messaging.Nms.Integration.Tests/Messaging/Nms/Core/NmsTemplateTests.cs +++ b/test/Spring/Spring.Messaging.Nms.Integration.Tests/Messaging/Nms/Core/NmsTemplateTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004-2009 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Apache.NMS; using NUnit.Framework; using Spring.Testing.NUnit; @@ -78,8 +74,6 @@ public class NmsTemplateTests : AbstractDependencyInjectionSpringContextTests Assert.AreEqual(msgText, text); } - #region Overrides of AbstractDependencyInjectionSpringContextTests - /// /// Subclasses must implement this property to return the locations of their /// config files. A plain path will be treated as a file system location. @@ -89,6 +83,4 @@ public class NmsTemplateTests : AbstractDependencyInjectionSpringContextTests { get { return new string[] { "assembly://Spring.Messaging.Nms.Integration.Tests/Spring.Messaging.Nms.Core/NmsTemplateTests.xml" }; } } - - #endregion } diff --git a/test/Spring/Spring.Messaging.Nms.Integration.Tests/Messaging/Nms/Core/SimpleGateway.cs b/test/Spring/Spring.Messaging.Nms.Integration.Tests/Messaging/Nms/Core/SimpleGateway.cs index e55018da..55cb2329 100644 --- a/test/Spring/Spring.Messaging.Nms.Integration.Tests/Messaging/Nms/Core/SimpleGateway.cs +++ b/test/Spring/Spring.Messaging.Nms.Integration.Tests/Messaging/Nms/Core/SimpleGateway.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using Apache.NMS; diff --git a/test/Spring/Spring.Messaging.Nms.Integration.Tests/Messaging/Nms/Core/SimpleMessageListener.cs b/test/Spring/Spring.Messaging.Nms.Integration.Tests/Messaging/Nms/Core/SimpleMessageListener.cs index 66374fac..38da8b97 100644 --- a/test/Spring/Spring.Messaging.Nms.Integration.Tests/Messaging/Nms/Core/SimpleMessageListener.cs +++ b/test/Spring/Spring.Messaging.Nms.Integration.Tests/Messaging/Nms/Core/SimpleMessageListener.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Apache.NMS; using Microsoft.Extensions.Logging; @@ -34,8 +30,6 @@ public class SimpleMessageListener : IMessageListener get { return messageCount; } } - #region Implementation of IMessageListener - public void OnMessage(IMessage message) { messageCount++; @@ -50,6 +44,4 @@ public class SimpleMessageListener : IMessageListener LOG.LogWarning("Can not process message of type " + message.GetType()); } } - - #endregion } diff --git a/test/Spring/Spring.Messaging.Nms.Integration.Tests/Messaging/Nms/Listener/SimpleMessageListenerContainerTests.cs b/test/Spring/Spring.Messaging.Nms.Integration.Tests/Messaging/Nms/Listener/SimpleMessageListenerContainerTests.cs index 7f57f49b..8eda4f96 100644 --- a/test/Spring/Spring.Messaging.Nms.Integration.Tests/Messaging/Nms/Listener/SimpleMessageListenerContainerTests.cs +++ b/test/Spring/Spring.Messaging.Nms.Integration.Tests/Messaging/Nms/Listener/SimpleMessageListenerContainerTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Messaging.Nms.Core; using Spring.Testing.NUnit; @@ -50,12 +46,8 @@ public class SimpleMessageListenerContainerTests : AbstractDependencyInjectionSp Assert.AreEqual(1, simpleMessageListener.MessageCount); } - #region Overrides of AbstractDependencyInjectionSpringContextTests - protected override string[] ConfigLocations { get { return new string[] { "assembly://Spring.Messaging.Nms.Integration.Tests/Spring.Messaging.Nms.Listener/SimpleMessageListenerContainerTests.xml" }; } } - - #endregion } diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Config/NmsNamespaceHandlerTests.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Config/NmsNamespaceHandlerTests.cs index fb893fdf..bb4eda07 100644 --- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Config/NmsNamespaceHandlerTests.cs +++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Config/NmsNamespaceHandlerTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using Apache.NMS; using FakeItEasy; using NUnit.Framework; @@ -32,8 +26,6 @@ using Spring.Objects; using Spring.Objects.Factory.Support; using Spring.Objects.Factory.Xml; -#endregion - namespace Spring.Messaging.Nms.Config; /// diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/CachedSessionTests.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/CachedSessionTests.cs index 255fa260..b4738f47 100644 --- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/CachedSessionTests.cs +++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/CachedSessionTests.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2013 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Apache.NMS; using NUnit.Framework; diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/CachingConnectionFactoryTests.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/CachingConnectionFactoryTests.cs index cb495d4e..65250566 100644 --- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/CachingConnectionFactoryTests.cs +++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/CachingConnectionFactoryTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Apache.NMS; using FakeItEasy; using NUnit.Framework; diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/MessageTransactionManagerTests.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/MessageTransactionManagerTests.cs index bd843c06..a122cd73 100644 --- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/MessageTransactionManagerTests.cs +++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/MessageTransactionManagerTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using Apache.NMS; using FakeItEasy; using NUnit.Framework; @@ -27,8 +21,6 @@ using Spring.Messaging.Nms.Core; using Spring.Transaction; using Spring.Transaction.Support; -#endregion - namespace Spring.Messaging.Nms.Connections; /// @@ -248,15 +240,11 @@ internal class AssertSessionCallback : ISessionCallback this.session = session; } - #region ISessionCallback Members - public object DoInNms(ISession session) { Assert.IsTrue(this.session == session); return null; } - - #endregion } internal class AssertNotSameSessionCallback : ISessionCallback @@ -268,13 +256,9 @@ internal class AssertNotSameSessionCallback : ISessionCallback this.session = session; } - #region ISessionCallback Members - public object DoInNms(ISession session) { Assert.IsTrue(this.session != session); return null; } - - #endregion } diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/NMSContextSingleConnectionFactoryTests.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/NMSContextSingleConnectionFactoryTests.cs index e08e9dac..77bf2f14 100644 --- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/NMSContextSingleConnectionFactoryTests.cs +++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/NMSContextSingleConnectionFactoryTests.cs @@ -1,5 +1,3 @@ -#region License - // /* // * Copyright 2022 the original author or authors. // * @@ -16,16 +14,10 @@ // * limitations under the License. // */ -#endregion - -#region Imports - using Apache.NMS; using FakeItEasy; using NUnit.Framework; -#endregion - namespace Spring.Messaging.Nms.Connections; /// diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/SingleConnectionFactoryTests.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/SingleConnectionFactoryTests.cs index 84f5275c..8628a770 100644 --- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/SingleConnectionFactoryTests.cs +++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/SingleConnectionFactoryTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using Apache.NMS; using FakeItEasy; using NUnit.Framework; using Spring.Messaging.Nms.Core; -#endregion - namespace Spring.Messaging.Nms.Connections; /// diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestConnectionFactory.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestConnectionFactory.cs index 70e97e66..85114981 100644 --- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestConnectionFactory.cs +++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestConnectionFactory.cs @@ -4,8 +4,6 @@ namespace Spring.Messaging.Nms.Connections; public class TestConnectionFactory : IConnectionFactory { - #region IConnectionFactory Members - public IConnection CreateConnection() { return new TestConnection(); @@ -89,6 +87,4 @@ public class TestConnectionFactory : IConnectionFactory get { throw new NotImplementedException(); } set { throw new NotImplementedException(); } } - - #endregion } \ No newline at end of file diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestExceptionListener.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestExceptionListener.cs index 025e7e75..a7c01989 100644 --- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestExceptionListener.cs +++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestExceptionListener.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Messaging.Nms.Core; namespace Spring.Messaging.Nms.Connections; diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestMessageConsumer.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestMessageConsumer.cs index 2ce8b279..00a7af0d 100644 --- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestMessageConsumer.cs +++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestMessageConsumer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Apache.NMS; namespace Spring.Messaging.Nms.Connections; diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestMessageListener.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestMessageListener.cs index 9cb6a77b..c667b045 100644 --- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestMessageListener.cs +++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestMessageListener.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Apache.NMS; using Spring.Messaging.Nms.Core; @@ -40,12 +36,8 @@ public class TestMessageListener : IMessageListener set { message = value; } } - #region IMessageListener Members - public void OnMessage(IMessage message) { this.message = message; } - - #endregion } diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestMessageProducer.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestMessageProducer.cs index 46bf05f6..95f512b0 100644 --- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestMessageProducer.cs +++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestMessageProducer.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Apache.NMS; namespace Spring.Messaging.Nms.Connections; diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestSession.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestSession.cs index ef0907f6..e67d78d8 100644 --- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestSession.cs +++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestSession.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Apache.NMS; using FakeItEasy; @@ -437,8 +433,6 @@ public class TestSession : ISession get { throw new NotImplementedException(); } } - #region Transaction State Events - public void TransactionStarted() { if (TransactionStartedListener != null) @@ -469,8 +463,6 @@ public class TestSession : ISession public event SessionTxEventDelegate TransactionRolledBackListener; - #endregion - public void Dispose() { throw new NotImplementedException(); diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Core/MessageTemplateTests.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Core/MessageTemplateTests.cs index 95fd2333..a5d46f12 100644 --- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Core/MessageTemplateTests.cs +++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Core/MessageTemplateTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using Apache.NMS; using FakeItEasy; @@ -28,8 +22,6 @@ using Spring.Messaging.Nms.Connections; using Spring.Messaging.Nms.Support.Destinations; using Spring.Transaction.Support; -#endregion - namespace Spring.Messaging.Nms.Core; /// diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Core/SimpleMessageConverterTests.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Core/SimpleMessageConverterTests.cs index 30c5efcc..5aed29b7 100644 --- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Core/SimpleMessageConverterTests.cs +++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Core/SimpleMessageConverterTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Text; using Apache.NMS; @@ -28,8 +22,6 @@ using FakeItEasy; using NUnit.Framework; using Spring.Messaging.Nms.Support.Converter; -#endregion - namespace Spring.Messaging.Nms.Core; /// diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Core/SimpleMessageListenerContainerTests.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Core/SimpleMessageListenerContainerTests.cs index 1b9fa91b..66227d15 100644 --- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Core/SimpleMessageListenerContainerTests.cs +++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Core/SimpleMessageListenerContainerTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using Apache.NMS; using FakeItEasy; using NUnit.Framework; using Spring.Messaging.Nms.Listener; using Spring.Util; -#endregion - namespace Spring.Messaging.Nms.Core; /// diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Integration/LoggingExceptionHandler.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Integration/LoggingExceptionHandler.cs index 1943a815..35bc604f 100644 --- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Integration/LoggingExceptionHandler.cs +++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Integration/LoggingExceptionHandler.cs @@ -8,18 +8,10 @@ namespace Spring.Messaging.Nms.Integration; /// public class LoggingExceptionHandler : IExceptionListener { - #region Logging Definition - private static readonly ILog LOG = LogManager.GetLogger(typeof(LoggingExceptionHandler)); - #endregion - - #region IExceptionListener Members - public void OnException(Exception e) { LOG.LogError(e, "Exception processing message"); } - - #endregion } diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Integration/SimpleMessageListener.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Integration/SimpleMessageListener.cs index d441a22c..f46f12bc 100644 --- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Integration/SimpleMessageListener.cs +++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Integration/SimpleMessageListener.cs @@ -6,12 +6,8 @@ namespace Spring.Messaging.Nms.Integration; public class SimpleMessageListener : IMessageListener { - #region Logging Definition - private static readonly ILogger LOG = LogManager.GetLogger(); - #endregion - private IMessage lastReceivedMessage; private int messageCount; @@ -25,14 +21,10 @@ public class SimpleMessageListener : IMessageListener get { return messageCount; } } - #region IMessageListener Members - public void OnMessage(IMessage message) { lastReceivedMessage = message; messageCount++; LOG.LogDebug("Message listener count = " + messageCount); } - - #endregion } diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Integration/SimpleMessageListenerContainerTests.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Integration/SimpleMessageListenerContainerTests.cs index f4357dc2..c5063de1 100644 --- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Integration/SimpleMessageListenerContainerTests.cs +++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Integration/SimpleMessageListenerContainerTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Messaging.Nms.Core; using Spring.Messaging.Nms.Listener; using Spring.Testing.NUnit; -#endregion - namespace Spring.Messaging.Nms.Integration; /// diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Listener/Adapter/IMessageContentsHandler.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Listener/Adapter/IMessageContentsHandler.cs index 6c2c9173..4208b2d3 100644 --- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Listener/Adapter/IMessageContentsHandler.cs +++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Listener/Adapter/IMessageContentsHandler.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; namespace Spring.Messaging.Nms.Listener.Adapter; diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Listener/Adapter/MessageContentsHandler.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Listener/Adapter/MessageContentsHandler.cs index eb7b0a10..d1dae23c 100644 --- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Listener/Adapter/MessageContentsHandler.cs +++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Listener/Adapter/MessageContentsHandler.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; namespace Spring.Messaging.Nms.Listener.Adapter; diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Listener/Adapter/MessageListenerAdapterTests.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Listener/Adapter/MessageListenerAdapterTests.cs index 1835cd24..61a52621 100644 --- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Listener/Adapter/MessageListenerAdapterTests.cs +++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Listener/Adapter/MessageListenerAdapterTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Text; using Apache.NMS; using FakeItEasy; using NUnit.Framework; -#endregion - namespace Spring.Messaging.Nms.Listener.Adapter; /// diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/StubQueue.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/StubQueue.cs index 06dfe5b0..53c80f1d 100644 --- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/StubQueue.cs +++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/StubQueue.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Apache.NMS; namespace Spring.Messaging.Nms; diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Support/Converter/TypeMapperTests.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Support/Converter/TypeMapperTests.cs index 3ba53803..92efb2c5 100644 --- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Support/Converter/TypeMapperTests.cs +++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Support/Converter/TypeMapperTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using NUnit.Framework; using Spring.Objects; diff --git a/test/Spring/Spring.Messaging.Nms.Tests/NmsCompilerOptionsTests.cs b/test/Spring/Spring.Messaging.Nms.Tests/NmsCompilerOptionsTests.cs index 582f4f89..34f2db6c 100644 --- a/test/Spring/Spring.Messaging.Nms.Tests/NmsCompilerOptionsTests.cs +++ b/test/Spring/Spring.Messaging.Nms.Tests/NmsCompilerOptionsTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004-2009 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; using Spring.Messaging.Nms.Listener.Adapter; -#endregion - namespace Spring; /// Test that the assembly is built with the correct DebugAttributes in release and debug builds. diff --git a/test/Spring/Spring.Messaging.Nms.Tests/NmsExceptionTests.cs b/test/Spring/Spring.Messaging.Nms.Tests/NmsExceptionTests.cs index 90a58107..b341001e 100644 --- a/test/Spring/Spring.Messaging.Nms.Tests/NmsExceptionTests.cs +++ b/test/Spring/Spring.Messaging.Nms.Tests/NmsExceptionTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; using Spring.Messaging.Nms.Connections; -#endregion - namespace Spring; /// diff --git a/test/Spring/Spring.Messaging.Tests/Messaging/Core/MessageQueueMetadataCacheTests.cs b/test/Spring/Spring.Messaging.Tests/Messaging/Core/MessageQueueMetadataCacheTests.cs index 706eb50f..59771d67 100644 --- a/test/Spring/Spring.Messaging.Tests/Messaging/Core/MessageQueueMetadataCacheTests.cs +++ b/test/Spring/Spring.Messaging.Tests/Messaging/Core/MessageQueueMetadataCacheTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Testing.NUnit; -#endregion - namespace Spring.Messaging.Core; /// diff --git a/test/Spring/Spring.Messaging.Tests/Messaging/Core/MessageQueueTemplateTests.cs b/test/Spring/Spring.Messaging.Tests/Messaging/Core/MessageQueueTemplateTests.cs index ddd8a488..929d2682 100644 --- a/test/Spring/Spring.Messaging.Tests/Messaging/Core/MessageQueueTemplateTests.cs +++ b/test/Spring/Spring.Messaging.Tests/Messaging/Core/MessageQueueTemplateTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Messaging; using NUnit.Framework; using Spring.Data.Core; @@ -27,8 +21,6 @@ using Spring.Testing.NUnit; using Spring.Transaction; using Spring.Transaction.Support; -#endregion - namespace Spring.Messaging.Core; /// @@ -105,8 +97,6 @@ public class MessageQueueTemplateTests : AbstractDependencyInjectionSpringContex Assert.AreEqual(q.DefaultMessageQueue, q.MessageQueueFactory.CreateMessageQueue(q.DefaultMessageQueueObjectName)); } - #region Integration Tests - to be moved to another test assembly - [Test] public void SendAndReceiveNonTransactional() { @@ -222,15 +212,11 @@ public class MessageQueueTemplateTests : AbstractDependencyInjectionSpringContex }); } - #endregion - protected override string[] ConfigLocations { get { return new string[] { "assembly://Spring.Messaging.Tests/Spring.Messaging.Core/MessageQueueTemplateTests.xml" }; } } - #region Some simple driver code for debugging - public void SimpleRemoteConsumption() { // string connectionWorking = @"FormatName:Direct=OS:MARKT60\Private$\testqueue"; @@ -256,6 +242,4 @@ public class MessageQueueTemplateTests : AbstractDependencyInjectionSpringContex Console.WriteLine(q.ReceiveAndConvert()); } } - - #endregion } diff --git a/test/Spring/Spring.Messaging.Tests/Messaging/Core/MessageQueueUtils.cs b/test/Spring/Spring.Messaging.Tests/Messaging/Core/MessageQueueUtils.cs index 21dbea32..74b49a11 100644 --- a/test/Spring/Spring.Messaging.Tests/Messaging/Core/MessageQueueUtils.cs +++ b/test/Spring/Spring.Messaging.Tests/Messaging/Core/MessageQueueUtils.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Messaging; namespace Spring.Messaging.Core; diff --git a/test/Spring/Spring.Messaging.Tests/Messaging/Core/ThreadingTests.cs b/test/Spring/Spring.Messaging.Tests/Messaging/Core/ThreadingTests.cs index 0a6a8385..25cd615a 100644 --- a/test/Spring/Spring.Messaging.Tests/Messaging/Core/ThreadingTests.cs +++ b/test/Spring/Spring.Messaging.Tests/Messaging/Core/ThreadingTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Messaging.Core; /// diff --git a/test/Spring/Spring.Messaging.Tests/Messaging/Listener/Adapter/MessageListenerAdapterTests.cs b/test/Spring/Spring.Messaging.Tests/Messaging/Listener/Adapter/MessageListenerAdapterTests.cs index 2ca62a17..79436169 100644 --- a/test/Spring/Spring.Messaging.Tests/Messaging/Listener/Adapter/MessageListenerAdapterTests.cs +++ b/test/Spring/Spring.Messaging.Tests/Messaging/Listener/Adapter/MessageListenerAdapterTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Messaging.Listener.Adapter; /// diff --git a/test/Spring/Spring.Messaging.Tests/Messaging/Listener/Adapter/StandardReflectionMessageListenerAdapter.cs b/test/Spring/Spring.Messaging.Tests/Messaging/Listener/Adapter/StandardReflectionMessageListenerAdapter.cs index ae5ac830..a518e9e9 100644 --- a/test/Spring/Spring.Messaging.Tests/Messaging/Listener/Adapter/StandardReflectionMessageListenerAdapter.cs +++ b/test/Spring/Spring.Messaging.Tests/Messaging/Listener/Adapter/StandardReflectionMessageListenerAdapter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region - using System.Reflection; using Spring.Expressions; using Spring.Util; -#endregion - namespace Spring.Messaging.Listener.Adapter; /// diff --git a/test/Spring/Spring.Messaging.Tests/Messaging/Listener/DistributedTxMessageListenerContainerTests.cs b/test/Spring/Spring.Messaging.Tests/Messaging/Listener/DistributedTxMessageListenerContainerTests.cs index 9bcdb8ae..279cb7f8 100644 --- a/test/Spring/Spring.Messaging.Tests/Messaging/Listener/DistributedTxMessageListenerContainerTests.cs +++ b/test/Spring/Spring.Messaging.Tests/Messaging/Listener/DistributedTxMessageListenerContainerTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Messaging.Core; using Spring.Testing.NUnit; -#endregion - namespace Spring.Messaging.Listener; /// diff --git a/test/Spring/Spring.Messaging.Tests/Messaging/Listener/LoggingExceptionHandler.cs b/test/Spring/Spring.Messaging.Tests/Messaging/Listener/LoggingExceptionHandler.cs index e09faf83..faea798e 100644 --- a/test/Spring/Spring.Messaging.Tests/Messaging/Listener/LoggingExceptionHandler.cs +++ b/test/Spring/Spring.Messaging.Tests/Messaging/Listener/LoggingExceptionHandler.cs @@ -10,12 +10,8 @@ public class LoggingExceptionHandler : IExceptionHandler { private TimeSpan recoveryTimeSpan; - #region Logging Definition - private static readonly ILog LOG = LogManager.GetLogger(typeof(LoggingExceptionHandler)); - #endregion - /// /// Initializes a new instance of the class with /// a default recovery time span of 5 seconds. @@ -35,8 +31,6 @@ public class LoggingExceptionHandler : IExceptionHandler set { recoveryTimeSpan = value; } } - #region IExceptionListener Members - public void OnException(Exception exception, Message message) { //TODO other exception handling @@ -60,6 +54,4 @@ public class LoggingExceptionHandler : IExceptionHandler LOG.LogError(exception, "got exception"); } } - - #endregion } diff --git a/test/Spring/Spring.Messaging.Tests/Messaging/Listener/MultiThreadedNonTransactionalMessageListenerContainerTests.cs b/test/Spring/Spring.Messaging.Tests/Messaging/Listener/MultiThreadedNonTransactionalMessageListenerContainerTests.cs index b9d55256..f4e8484f 100644 --- a/test/Spring/Spring.Messaging.Tests/Messaging/Listener/MultiThreadedNonTransactionalMessageListenerContainerTests.cs +++ b/test/Spring/Spring.Messaging.Tests/Messaging/Listener/MultiThreadedNonTransactionalMessageListenerContainerTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Messaging.Core; using Spring.Testing.NUnit; using System.Diagnostics; -#endregion - namespace Spring.Messaging.Listener; /// diff --git a/test/Spring/Spring.Messaging.Tests/Messaging/Listener/NonTransactionalMessageListenerContainerTests.cs b/test/Spring/Spring.Messaging.Tests/Messaging/Listener/NonTransactionalMessageListenerContainerTests.cs index cdd48f10..991c00fa 100644 --- a/test/Spring/Spring.Messaging.Tests/Messaging/Listener/NonTransactionalMessageListenerContainerTests.cs +++ b/test/Spring/Spring.Messaging.Tests/Messaging/Listener/NonTransactionalMessageListenerContainerTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Messaging.Core; using Spring.Testing.NUnit; -#endregion - namespace Spring.Messaging.Listener; /// diff --git a/test/Spring/Spring.Messaging.Tests/Messaging/Listener/SimpleExceptionHandler.cs b/test/Spring/Spring.Messaging.Tests/Messaging/Listener/SimpleExceptionHandler.cs index 159d7a2f..7b4271d3 100644 --- a/test/Spring/Spring.Messaging.Tests/Messaging/Listener/SimpleExceptionHandler.cs +++ b/test/Spring/Spring.Messaging.Tests/Messaging/Listener/SimpleExceptionHandler.cs @@ -5,12 +5,8 @@ namespace Spring.Messaging.Listener; public class SimpleExceptionHandler : IExceptionHandler { - #region Logging - private static readonly ILogger LOG = LogManager.GetLogger(); - #endregion - private int messageCount; public int MessageCount @@ -19,14 +15,10 @@ public class SimpleExceptionHandler : IExceptionHandler set { messageCount = value; } } - #region IExceptionHandler Members - public void OnException(Exception exception, Message message) { LOG.LogError("Exception Handler processing message id = [" + message.Id + "]"); LOG.LogError(exception, "Exception = "); messageCount++; } - - #endregion } diff --git a/test/Spring/Spring.Messaging.Tests/Messaging/Listener/SimpleHandler.cs b/test/Spring/Spring.Messaging.Tests/Messaging/Listener/SimpleHandler.cs index 2a4e6ba0..fb4f642e 100644 --- a/test/Spring/Spring.Messaging.Tests/Messaging/Listener/SimpleHandler.cs +++ b/test/Spring/Spring.Messaging.Tests/Messaging/Listener/SimpleHandler.cs @@ -4,12 +4,8 @@ namespace Spring.Messaging.Listener; public class SimpleHandler { - #region Logging - private static readonly ILogger LOG = LogManager.GetLogger(); - #endregion - private int messageCount; private string stateVariable; diff --git a/test/Spring/Spring.Messaging.Tests/Messaging/Listener/SimpleMessageListener.cs b/test/Spring/Spring.Messaging.Tests/Messaging/Listener/SimpleMessageListener.cs index 1dd15711..212a8a5b 100644 --- a/test/Spring/Spring.Messaging.Tests/Messaging/Listener/SimpleMessageListener.cs +++ b/test/Spring/Spring.Messaging.Tests/Messaging/Listener/SimpleMessageListener.cs @@ -5,12 +5,8 @@ namespace Spring.Messaging.Listener; public class SimpleMessageListener : IMessageListener { - #region Logging Definition - private static readonly ILogger LOG = LogManager.GetLogger(); - #endregion - private Message lastReceivedMessage; private int messageCount; @@ -24,14 +20,10 @@ public class SimpleMessageListener : IMessageListener get { return messageCount; } } - #region IMessageListener Members - public void OnMessage(Message message) { lastReceivedMessage = message; messageCount++; LOG.LogDebug("Message listener count = " + messageCount); } - - #endregion } \ No newline at end of file diff --git a/test/Spring/Spring.Messaging.Tests/Messaging/Listener/TransactionalMessageListenerContainerTests.cs b/test/Spring/Spring.Messaging.Tests/Messaging/Listener/TransactionalMessageListenerContainerTests.cs index 81100ed7..343bedbc 100644 --- a/test/Spring/Spring.Messaging.Tests/Messaging/Listener/TransactionalMessageListenerContainerTests.cs +++ b/test/Spring/Spring.Messaging.Tests/Messaging/Listener/TransactionalMessageListenerContainerTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Messaging.Core; using Spring.Testing.NUnit; -#endregion - namespace Spring.Messaging.Listener; /// diff --git a/test/Spring/Spring.Messaging.Tests/Messaging/Listener/WaitingHandler.cs b/test/Spring/Spring.Messaging.Tests/Messaging/Listener/WaitingHandler.cs index 18f21416..51a42d7c 100644 --- a/test/Spring/Spring.Messaging.Tests/Messaging/Listener/WaitingHandler.cs +++ b/test/Spring/Spring.Messaging.Tests/Messaging/Listener/WaitingHandler.cs @@ -4,12 +4,8 @@ namespace Spring.Messaging.Listener; public class WaitingHandler { - #region Logging - private static readonly ILogger LOG = LogManager.GetLogger(); - #endregion - private int messageCount; private string stateVariable; diff --git a/test/Spring/Spring.Messaging.Tests/Messaging/Support/MessageAlreadyProcessedException.cs b/test/Spring/Spring.Messaging.Tests/Messaging/Support/MessageAlreadyProcessedException.cs index 58c1f853..25fe12ac 100644 --- a/test/Spring/Spring.Messaging.Tests/Messaging/Support/MessageAlreadyProcessedException.cs +++ b/test/Spring/Spring.Messaging.Tests/Messaging/Support/MessageAlreadyProcessedException.cs @@ -11,8 +11,6 @@ namespace Spring.Messaging; [Serializable] public class MessageAlreadyProcessedException : MessagingException { - #region Constructor (s) / Destructor - /// Creates a new instance of the MessageAlreadyProcessedException class. public MessageAlreadyProcessedException() { @@ -59,6 +57,4 @@ public class MessageAlreadyProcessedException : MessagingException : base(info, context) { } - - #endregion } diff --git a/test/Spring/Spring.Messaging.Tests/Messaging/Support/MessageQueueFactoryObjectTests.cs b/test/Spring/Spring.Messaging.Tests/Messaging/Support/MessageQueueFactoryObjectTests.cs index 3093199f..181153b5 100644 --- a/test/Spring/Spring.Messaging.Tests/Messaging/Support/MessageQueueFactoryObjectTests.cs +++ b/test/Spring/Spring.Messaging.Tests/Messaging/Support/MessageQueueFactoryObjectTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Messaging; using NUnit.Framework; using Spring.Testing.NUnit; -#endregion - namespace Spring.Messaging.Support; /// diff --git a/test/Spring/Spring.Messaging.Tests/MessagingCompilerOptionsTests.cs b/test/Spring/Spring.Messaging.Tests/MessagingCompilerOptionsTests.cs index 89b68636..648bfd76 100644 --- a/test/Spring/Spring.Messaging.Tests/MessagingCompilerOptionsTests.cs +++ b/test/Spring/Spring.Messaging.Tests/MessagingCompilerOptionsTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004-2009 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; using Spring.Messaging; -#endregion - namespace Spring; /// Test that the Messaging assembly is built with the correct DebugAttributes in release and debug builds. diff --git a/test/Spring/Spring.Messaging.Tests/MessagingExceptionTests.cs b/test/Spring/Spring.Messaging.Tests/MessagingExceptionTests.cs index 92c0cc88..30dcd56a 100644 --- a/test/Spring/Spring.Messaging.Tests/MessagingExceptionTests.cs +++ b/test/Spring/Spring.Messaging.Tests/MessagingExceptionTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; using Spring.Messaging; -#endregion - namespace Spring; /// diff --git a/test/Spring/Spring.Scheduling.Quartz3.Integration.Tests/Scheduling/Quartz/LocalDataSourceJobStoreTest.cs b/test/Spring/Spring.Scheduling.Quartz3.Integration.Tests/Scheduling/Quartz/LocalDataSourceJobStoreTest.cs index cda8c3b9..d13c8110 100644 --- a/test/Spring/Spring.Scheduling.Quartz3.Integration.Tests/Scheduling/Quartz/LocalDataSourceJobStoreTest.cs +++ b/test/Spring/Spring.Scheduling.Quartz3.Integration.Tests/Scheduling/Quartz/LocalDataSourceJobStoreTest.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2007 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Context; using Spring.Context.Support; -#endregion - namespace Spring.Scheduling.Quartz.Integration.Tests; [TestFixture] diff --git a/test/Spring/Spring.Scheduling.Quartz3.Tests/QuartzCompilerOptionsTests.cs b/test/Spring/Spring.Scheduling.Quartz3.Tests/QuartzCompilerOptionsTests.cs index 88e92dda..180874d8 100644 --- a/test/Spring/Spring.Scheduling.Quartz3.Tests/QuartzCompilerOptionsTests.cs +++ b/test/Spring/Spring.Scheduling.Quartz3.Tests/QuartzCompilerOptionsTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004-2009 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; using Spring.Scheduling.Quartz; -#endregion - namespace Spring; /// Test that the assembly is built with the correct DebugAttributes in release and debug builds. diff --git a/test/Spring/Spring.Services.Tests/AssemblyInfo.cs b/test/Spring/Spring.Services.Tests/AssemblyInfo.cs index ac20465e..112a9ccf 100644 --- a/test/Spring/Spring.Services.Tests/AssemblyInfo.cs +++ b/test/Spring/Spring.Services.Tests/AssemblyInfo.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; [assembly: AssemblyTitle("Spring.Services Tests")] diff --git a/test/Spring/Spring.Services.Tests/EnterpriseServices/ExeConfigurationSystemTests.cs b/test/Spring/Spring.Services.Tests/EnterpriseServices/ExeConfigurationSystemTests.cs index 4e4ce798..be689aa8 100644 --- a/test/Spring/Spring.Services.Tests/EnterpriseServices/ExeConfigurationSystemTests.cs +++ b/test/Spring/Spring.Services.Tests/EnterpriseServices/ExeConfigurationSystemTests.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Configuration; using System.Configuration.Internal; using NUnit.Framework; diff --git a/test/Spring/Spring.Services.Tests/EnterpriseServices/ExportedServicedComponentSample.cs b/test/Spring/Spring.Services.Tests/EnterpriseServices/ExportedServicedComponentSample.cs index e95d598f..6baf4322 100644 --- a/test/Spring/Spring.Services.Tests/EnterpriseServices/ExportedServicedComponentSample.cs +++ b/test/Spring/Spring.Services.Tests/EnterpriseServices/ExportedServicedComponentSample.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Diagnostics; using System.EnterpriseServices; using System.Reflection; diff --git a/test/Spring/Spring.Services.Tests/EnterpriseServices/ServicedComponentExporterTests.cs b/test/Spring/Spring.Services.Tests/EnterpriseServices/ServicedComponentExporterTests.cs index ad98cdcf..756dbe00 100644 --- a/test/Spring/Spring.Services.Tests/EnterpriseServices/ServicedComponentExporterTests.cs +++ b/test/Spring/Spring.Services.Tests/EnterpriseServices/ServicedComponentExporterTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2007 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.EnterpriseServices; using System.Reflection; @@ -30,8 +24,6 @@ using Spring.Context; using Spring.Context.Support; using Spring.Objects; -#endregion - namespace Spring.EnterpriseServices; /// @@ -168,8 +160,6 @@ public class ServicedComponentExporterTests return assembly.GetType(objectName + "Service"); } - #region Private helpers & classes - public class CountingMethodInterceptor : IMethodInterceptor { private int Calls = 0; @@ -200,6 +190,4 @@ public class ServicedComponentExporterTests return (Type) result; } - - #endregion } diff --git a/test/Spring/Spring.Services.Tests/Remoting/CaoExporterTests.cs b/test/Spring/Spring.Services.Tests/Remoting/CaoExporterTests.cs index b468a479..6502e78b 100644 --- a/test/Spring/Spring.Services.Tests/Remoting/CaoExporterTests.cs +++ b/test/Spring/Spring.Services.Tests/Remoting/CaoExporterTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Runtime.Remoting.Lifetime; using NUnit.Framework; using Spring.Context; using Spring.Context.Support; using Spring.Remoting.Support; -#endregion - namespace Spring.Remoting; /// diff --git a/test/Spring/Spring.Services.Tests/Remoting/CaoFactoryObjectTests.cs b/test/Spring/Spring.Services.Tests/Remoting/CaoFactoryObjectTests.cs index 7b2feb4a..9722179f 100644 --- a/test/Spring/Spring.Services.Tests/Remoting/CaoFactoryObjectTests.cs +++ b/test/Spring/Spring.Services.Tests/Remoting/CaoFactoryObjectTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Context; using Spring.Context.Support; -#endregion - namespace Spring.Remoting; /// diff --git a/test/Spring/Spring.Services.Tests/Remoting/ISimpleCounter.cs b/test/Spring/Spring.Services.Tests/Remoting/ISimpleCounter.cs index 6d08ab0b..84051cb5 100644 --- a/test/Spring/Spring.Services.Tests/Remoting/ISimpleCounter.cs +++ b/test/Spring/Spring.Services.Tests/Remoting/ISimpleCounter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Remoting; public interface ISimpleCounter diff --git a/test/Spring/Spring.Services.Tests/Remoting/RemoteObjectFactoryTests.cs b/test/Spring/Spring.Services.Tests/Remoting/RemoteObjectFactoryTests.cs index 00c56e64..1660da18 100644 --- a/test/Spring/Spring.Services.Tests/Remoting/RemoteObjectFactoryTests.cs +++ b/test/Spring/Spring.Services.Tests/Remoting/RemoteObjectFactoryTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Runtime.Remoting.Lifetime; using NUnit.Framework; -#endregion - namespace Spring.Remoting; /// diff --git a/test/Spring/Spring.Services.Tests/Remoting/RemotingConfigParserTests.cs b/test/Spring/Spring.Services.Tests/Remoting/RemotingConfigParserTests.cs index 30bcfc9a..7e33e73f 100644 --- a/test/Spring/Spring.Services.Tests/Remoting/RemotingConfigParserTests.cs +++ b/test/Spring/Spring.Services.Tests/Remoting/RemotingConfigParserTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Remoting; /// diff --git a/test/Spring/Spring.Services.Tests/Remoting/RemotingConfigurerTests.cs b/test/Spring/Spring.Services.Tests/Remoting/RemotingConfigurerTests.cs index 9302bf52..21d6419a 100644 --- a/test/Spring/Spring.Services.Tests/Remoting/RemotingConfigurerTests.cs +++ b/test/Spring/Spring.Services.Tests/Remoting/RemotingConfigurerTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Runtime.Remoting.Channels; using NUnit.Framework; using Spring.Context; using Spring.Context.Support; -#endregion - namespace Spring.Remoting; /// diff --git a/test/Spring/Spring.Services.Tests/Remoting/SaoExporterTests.cs b/test/Spring/Spring.Services.Tests/Remoting/SaoExporterTests.cs index d2de28d9..ef163793 100644 --- a/test/Spring/Spring.Services.Tests/Remoting/SaoExporterTests.cs +++ b/test/Spring/Spring.Services.Tests/Remoting/SaoExporterTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using FakeItEasy; using NUnit.Framework; using Spring.Core.IO; @@ -27,8 +21,6 @@ using Spring.Objects.Factory; using Spring.Objects.Factory.Support; using Spring.Objects.Factory.Xml; -#endregion - namespace Spring.Remoting; /// diff --git a/test/Spring/Spring.Services.Tests/Remoting/SaoFactoryObjectTests.cs b/test/Spring/Spring.Services.Tests/Remoting/SaoFactoryObjectTests.cs index 268b4840..39842069 100644 --- a/test/Spring/Spring.Services.Tests/Remoting/SaoFactoryObjectTests.cs +++ b/test/Spring/Spring.Services.Tests/Remoting/SaoFactoryObjectTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2005 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Runtime.Remoting; using System.Runtime.Remoting.Lifetime; using NUnit.Framework; @@ -29,8 +23,6 @@ using Spring.Context.Support; using Spring.Objects; using Spring.Objects.Factory.Xml; -#endregion - namespace Spring.Remoting; /// diff --git a/test/Spring/Spring.Services.Tests/Remoting/SimpleCounter.cs b/test/Spring/Spring.Services.Tests/Remoting/SimpleCounter.cs index d7fdf5ed..d1d24940 100644 --- a/test/Spring/Spring.Services.Tests/Remoting/SimpleCounter.cs +++ b/test/Spring/Spring.Services.Tests/Remoting/SimpleCounter.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004 the original author or authors. * @@ -16,12 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - -#endregion - namespace Spring.Remoting; /// diff --git a/test/Spring/Spring.Services.Tests/ServiceModel/Config/ChannelFactoryObjectDefinitionParserTests.cs b/test/Spring/Spring.Services.Tests/ServiceModel/Config/ChannelFactoryObjectDefinitionParserTests.cs index e0d7d465..9fd5d744 100644 --- a/test/Spring/Spring.Services.Tests/ServiceModel/Config/ChannelFactoryObjectDefinitionParserTests.cs +++ b/test/Spring/Spring.Services.Tests/ServiceModel/Config/ChannelFactoryObjectDefinitionParserTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.ServiceModel; using Spring.Context; using Spring.Context.Support; @@ -27,8 +21,6 @@ using Spring.Objects.Factory.Xml; using Spring.Objects.Factory.Support; using NUnit.Framework; -#endregion - namespace Spring.ServiceModel.Config; /// @@ -129,14 +121,10 @@ public class ChannelFactoryObjectDefinitionParserTests Assert.IsNotNull(contract); } - #region Test classes - [ServiceContract(Namespace = "http://Spring.Services.Tests")] public interface IContract { [OperationContract(Name = "MySomeMethod")] string SomeMethod(int param); } - - #endregion } diff --git a/test/Spring/Spring.Services.Tests/ServiceModel/Config/WcfNamespaceParserTests.cs b/test/Spring/Spring.Services.Tests/ServiceModel/Config/WcfNamespaceParserTests.cs index 2e085ee6..3320f81b 100644 --- a/test/Spring/Spring.Services.Tests/ServiceModel/Config/WcfNamespaceParserTests.cs +++ b/test/Spring/Spring.Services.Tests/ServiceModel/Config/WcfNamespaceParserTests.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using Spring.Objects.Factory.Xml; using NUnit.Framework; -#endregion - namespace Spring.ServiceModel.Config; /// diff --git a/test/Spring/Spring.Services.Tests/ServiceModel/ServiceExporterTests.cs b/test/Spring/Spring.Services.Tests/ServiceModel/ServiceExporterTests.cs index 58d24b4c..fa9afcab 100644 --- a/test/Spring/Spring.Services.Tests/ServiceModel/ServiceExporterTests.cs +++ b/test/Spring/Spring.Services.Tests/ServiceModel/ServiceExporterTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Text; using System.Reflection; using System.Net.Security; @@ -29,8 +23,6 @@ using Spring.Core.IO; using Spring.Objects.Factory; using Spring.Objects.Factory.Xml; -#endregion - namespace Spring.ServiceModel; /// @@ -317,8 +309,6 @@ public sealed class ServiceExporterTests Assert.AreEqual("MySomeMethod", oca.Name); } - #region Test classes - public interface IContract { string SomeMethod(int param); @@ -382,6 +372,4 @@ public sealed class ServiceExporterTests // return param.ToString(); // } //} - - #endregion } diff --git a/test/Spring/Spring.Services.Tests/ServiceModel/SpringServiceHostTests.cs b/test/Spring/Spring.Services.Tests/ServiceModel/SpringServiceHostTests.cs index 7a87dfb7..5ded7151 100644 --- a/test/Spring/Spring.Services.Tests/ServiceModel/SpringServiceHostTests.cs +++ b/test/Spring/Spring.Services.Tests/ServiceModel/SpringServiceHostTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.ServiceModel; using NUnit.Framework; using Spring.Objects.Factory.Support; diff --git a/test/Spring/Spring.Services.Tests/ServicesCompilerOptionsTests.cs b/test/Spring/Spring.Services.Tests/ServicesCompilerOptionsTests.cs index 31d1f417..15eca647 100644 --- a/test/Spring/Spring.Services.Tests/ServicesCompilerOptionsTests.cs +++ b/test/Spring/Spring.Services.Tests/ServicesCompilerOptionsTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004-2009 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; using Spring.Remoting; -#endregion - namespace Spring; /// Test that the assembly is built with the correct DebugAttributes in release and debug builds. diff --git a/test/Spring/Spring.Services.Tests/Web/Services/WebServiceProxyFactoryTests.cs b/test/Spring/Spring.Services.Tests/Web/Services/WebServiceProxyFactoryTests.cs index 70f252b9..cd2ae118 100644 --- a/test/Spring/Spring.Services.Tests/Web/Services/WebServiceProxyFactoryTests.cs +++ b/test/Spring/Spring.Services.Tests/Web/Services/WebServiceProxyFactoryTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2007 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using System.Xml.Serialization; using System.Web.Services; @@ -33,8 +27,6 @@ using Spring.Context; using Spring.Context.Support; using Spring.Util; -#endregion - namespace Spring.Web.Services; /// @@ -528,8 +520,6 @@ public class WebServiceProxyFactoryTests ObjectUtils.InstantiateType(proxyType); } - #region NestedSchema - [Test] public void NestedSchema() { @@ -559,8 +549,6 @@ public class WebServiceProxyFactoryTests { } - #endregion - public void WcfBasicHttpBinding() { using (ServiceHost host = new ServiceHost(typeof(WcfServiceImpl), new Uri("http://localhost:8000/WcfBasicHttpBinding/Service"))) @@ -605,8 +593,6 @@ public class WebServiceProxyFactoryTests } } - #region Test Classes - public interface IHelloWorld { string SayHelloWorld(); @@ -657,6 +643,4 @@ public class WebServiceProxyFactoryTests public class CustomClientProtocol : SoapHttpClientProtocol { } - - #endregion } \ No newline at end of file diff --git a/test/Spring/Spring.Template.Velocity.Castle.Tests/Template/Velocity/Config/TemplateNamespaceParserTests.cs b/test/Spring/Spring.Template.Velocity.Castle.Tests/Template/Velocity/Config/TemplateNamespaceParserTests.cs index 42c469df..d61ee9c5 100644 --- a/test/Spring/Spring.Template.Velocity.Castle.Tests/Template/Velocity/Config/TemplateNamespaceParserTests.cs +++ b/test/Spring/Spring.Template.Velocity.Castle.Tests/Template/Velocity/Config/TemplateNamespaceParserTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Text; using Commons.Collections; @@ -30,8 +24,6 @@ using NVelocity.Runtime.Resource; using NVelocity.Runtime.Resource.Loader; using Spring.Core.IO; -#endregion - namespace Spring.Template.Velocity.Config; /// @@ -41,24 +33,16 @@ namespace Spring.Template.Velocity.Config; [TestFixture] public class TemplateNamespaceParserTests : VelocityEngineTestBase { - #region convinience properties aliases - private const string PropertyModificationCheck = TemplateDefinitionConstants.PropertyResourceLoaderModificationCheckInterval; private const string PropertyResourceLoaderCachce = TemplateDefinitionConstants.PropertyResourceLoaderCaching; - #endregion - - #region test constants - private const int DEFAULT_CACHE_SIZE = 200; private const int DEFAULT_MOD_CHECK = 30; private const bool DEFAULT_CACHE_FLAG = true; - #endregion - /// /// Test a full file-base configuration /// @@ -177,8 +161,6 @@ public class TemplateNamespaceParserTests : VelocityEngineTestBase AssertMergedValue(velocityEngine, "Template/Velocity/SimpleTemplate.vm"); } - #region internal test methods - /// /// Grab a single property from (if it's an array return the first value) from the velocityEngine /// @@ -193,12 +175,8 @@ public class TemplateNamespaceParserTests : VelocityEngineTestBase return (string) property; } - - #endregion } -#region test classes - /// /// Test class for a custom resource loader class /// @@ -222,6 +200,4 @@ internal sealed class TestCustomResourceLoader : ResourceLoader { return resource.LastModified; } -} - -#endregion +} \ No newline at end of file diff --git a/test/Spring/Spring.Template.Velocity.Tests/Template/Velocity/Config/TemplateNamespaceParserTests.cs b/test/Spring/Spring.Template.Velocity.Tests/Template/Velocity/Config/TemplateNamespaceParserTests.cs index 2d46b63a..159a7eba 100644 --- a/test/Spring/Spring.Template.Velocity.Tests/Template/Velocity/Config/TemplateNamespaceParserTests.cs +++ b/test/Spring/Spring.Template.Velocity.Tests/Template/Velocity/Config/TemplateNamespaceParserTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Text; using Commons.Collections; @@ -30,8 +24,6 @@ using NVelocity.Runtime.Resource; using NVelocity.Runtime.Resource.Loader; using Spring.Core.IO; -#endregion - namespace Spring.Template.Velocity.Config; /// @@ -41,24 +33,16 @@ namespace Spring.Template.Velocity.Config; [TestFixture] public class TemplateNamespaceParserTests : VelocityEngineTestBase { - #region convinience properties aliases - private const string PropertyModificationCheck = TemplateDefinitionConstants.PropertyResourceLoaderModificationCheckInterval; private const string PropertyResourceLoaderCachce = TemplateDefinitionConstants.PropertyResourceLoaderCaching; - #endregion - - #region test constants - private const int DEFAULT_CACHE_SIZE = 200; private const int DEFAULT_MOD_CHECK = 30; private const bool DEFAULT_CACHE_FLAG = true; - #endregion - /// /// Test a full file-base configuration /// @@ -177,8 +161,6 @@ public class TemplateNamespaceParserTests : VelocityEngineTestBase AssertMergedValue(velocityEngine, "Template/Velocity/SimpleTemplate.vm"); } - #region internal test methods - /// /// Grab a single property from (if it's an array return the first value) from the velocityEngine /// @@ -193,12 +175,8 @@ public class TemplateNamespaceParserTests : VelocityEngineTestBase return (string) property; } - - #endregion } -#region test classes - /// /// Test class for a custom resource loader class /// @@ -222,6 +200,4 @@ internal sealed class TestCustomResourceLoader : ResourceLoader { return resource.LastModified; } -} - -#endregion \ No newline at end of file +} \ No newline at end of file diff --git a/test/Spring/Spring.Template.Velocity.Tests/Template/Velocity/VelocityEngineFactoryObjectTests.cs b/test/Spring/Spring.Template.Velocity.Tests/Template/Velocity/VelocityEngineFactoryObjectTests.cs index 45100408..75429a69 100644 --- a/test/Spring/Spring.Template.Velocity.Tests/Template/Velocity/VelocityEngineFactoryObjectTests.cs +++ b/test/Spring/Spring.Template.Velocity.Tests/Template/Velocity/VelocityEngineFactoryObjectTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Text; using NUnit.Framework; using NVelocity.App; using NVelocity.Exception; -#endregion - namespace Spring.Template.Velocity; /// diff --git a/test/Spring/Spring.Template.Velocity.Tests/Template/Velocity/VelocityEngineTestBase.cs b/test/Spring/Spring.Template.Velocity.Tests/Template/Velocity/VelocityEngineTestBase.cs index dfdd2cfa..8b593027 100644 --- a/test/Spring/Spring.Template.Velocity.Tests/Template/Velocity/VelocityEngineTestBase.cs +++ b/test/Spring/Spring.Template.Velocity.Tests/Template/Velocity/VelocityEngineTestBase.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Text; using NUnit.Framework; @@ -27,8 +21,6 @@ using NVelocity.App; using Spring.Context.Support; using Spring.Objects.Factory.Xml; -#endregion - namespace Spring.Template.Velocity; /// @@ -51,8 +43,6 @@ public class VelocityEngineTestBase /// protected const string TEST_VALUE = "TEST_VALUE"; - #region setup - /// /// Test setup. /// @@ -66,10 +56,6 @@ public class VelocityEngineTestBase model.Add("var1", TEST_VALUE); } - #endregion - - #region teardown - /// /// Test cleanup. /// @@ -80,10 +66,6 @@ public class VelocityEngineTestBase model.Clear(); } - #endregion - - #region base helper methods - /// /// Basic method for asserting the expected TEST_VALUE in the merged template /// @@ -92,6 +74,4 @@ public class VelocityEngineTestBase string mergedTemplate = VelocityEngineUtils.MergeTemplateIntoString(velocityEngine, template, Encoding.UTF8.WebName, model); Assert.AreEqual(string.Format("value={0}", TEST_VALUE), mergedTemplate); } - - #endregion } diff --git a/test/Spring/Spring.Template.Velocity.Tests/VelocityCompilerOptionsTests.cs b/test/Spring/Spring.Template.Velocity.Tests/VelocityCompilerOptionsTests.cs index b4f48eb5..f5ec0c39 100644 --- a/test/Spring/Spring.Template.Velocity.Tests/VelocityCompilerOptionsTests.cs +++ b/test/Spring/Spring.Template.Velocity.Tests/VelocityCompilerOptionsTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004-2009 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; using Spring.Template.Velocity; -#endregion - namespace Spring; /// Test that the assembly is built with the correct DebugAttributes in release and debug builds. diff --git a/test/Spring/Spring.Testing.Microsoft.Tests/Testing/Microsoft/AbstractDependencyInjectionSpringContextTestsTests.cs b/test/Spring/Spring.Testing.Microsoft.Tests/Testing/Microsoft/AbstractDependencyInjectionSpringContextTestsTests.cs index bcef6433..da78590d 100644 --- a/test/Spring/Spring.Testing.Microsoft.Tests/Testing/Microsoft/AbstractDependencyInjectionSpringContextTestsTests.cs +++ b/test/Spring/Spring.Testing.Microsoft.Tests/Testing/Microsoft/AbstractDependencyInjectionSpringContextTestsTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Microsoft.VisualStudio.TestTools.UnitTesting; using Spring.Context; using Spring.Context.Support; diff --git a/test/Spring/Spring.Testing.NUnit.Tests/NUnitCompilerOptionsTests.cs b/test/Spring/Spring.Testing.NUnit.Tests/NUnitCompilerOptionsTests.cs index abee0f03..a10e6bba 100644 --- a/test/Spring/Spring.Testing.NUnit.Tests/NUnitCompilerOptionsTests.cs +++ b/test/Spring/Spring.Testing.NUnit.Tests/NUnitCompilerOptionsTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004-2009 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; using Spring.Testing.NUnit; -#endregion - namespace Spring; /// Test that the assembly is built with the correct DebugAttributes in release and debug builds. diff --git a/test/Spring/Spring.Testing.NUnit.Tests/Testing/Ado/SimpleAdoTestUtilsTests.cs b/test/Spring/Spring.Testing.NUnit.Tests/Testing/Ado/SimpleAdoTestUtilsTests.cs index 40f7ffc1..30bf9ce4 100644 --- a/test/Spring/Spring.Testing.NUnit.Tests/Testing/Ado/SimpleAdoTestUtilsTests.cs +++ b/test/Spring/Spring.Testing.NUnit.Tests/Testing/Ado/SimpleAdoTestUtilsTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Data; using FakeItEasy; using NUnit.Framework; diff --git a/test/Spring/Spring.Testing.NUnit.Tests/Testing/NUnit/AbstractDependencyInjectionSpringContextTestsTests.cs b/test/Spring/Spring.Testing.NUnit.Tests/Testing/NUnit/AbstractDependencyInjectionSpringContextTestsTests.cs index 5545a44d..14e98ec1 100644 --- a/test/Spring/Spring.Testing.NUnit.Tests/Testing/NUnit/AbstractDependencyInjectionSpringContextTestsTests.cs +++ b/test/Spring/Spring.Testing.NUnit.Tests/Testing/NUnit/AbstractDependencyInjectionSpringContextTestsTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Context; using Spring.Context.Support; diff --git a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Bsn/ConversationEvidenceBsnImpl.cs b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Bsn/ConversationEvidenceBsnImpl.cs index bd7bc0e7..f37dc255 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Bsn/ConversationEvidenceBsnImpl.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Bsn/ConversationEvidenceBsnImpl.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Bsn; /// @@ -35,8 +31,6 @@ public class ConversationEvidenceBsnImpl : IConversationEvidenceBsn uniqueId = Guid.NewGuid().ToString(); } - #region IConversationEvidenceBsn Members - /// /// /// @@ -45,6 +39,4 @@ public class ConversationEvidenceBsnImpl : IConversationEvidenceBsn { return this.uniqueId; } - - #endregion } diff --git a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Bsn/IConversationEvidenceBsn.cs b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Bsn/IConversationEvidenceBsn.cs index c30db499..06126663 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Bsn/IConversationEvidenceBsn.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Bsn/IConversationEvidenceBsn.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Bsn; /// diff --git a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Bsn/INoDeferedErrorBsn.cs b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Bsn/INoDeferedErrorBsn.cs index c6231d9c..a8479bde 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Bsn/INoDeferedErrorBsn.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Bsn/INoDeferedErrorBsn.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - namespace Spring.Bsn; /// diff --git a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Bsn/NoDeferedErrorBsnImpl.cs b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Bsn/NoDeferedErrorBsnImpl.cs index 821c3cf8..035bf06f 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Bsn/NoDeferedErrorBsnImpl.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Bsn/NoDeferedErrorBsnImpl.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NHibernate; using Spring.Entities; using NUnit.Framework; @@ -58,8 +54,6 @@ public class ConnectionReleaseModeIssueBsnImpl : IConnectionReleaseModeIssueBsn set { sessionFactory = value; } } - #region IConnectionReleaseModeIssueBsn Members - /// /// Test. /// @@ -75,6 +69,4 @@ public class ConnectionReleaseModeIssueBsnImpl : IConnectionReleaseModeIssueBsn Assert.AreEqual(1, ConnectionCreationTrackingDbProvider.Count, "ConnectionCreationTrackingDbProvider.Count"); } - - #endregion } diff --git a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Conversation/HttpWebclientExtensions.cs b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Conversation/HttpWebclientExtensions.cs index 78f36ca7..f03364d0 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Conversation/HttpWebclientExtensions.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Conversation/HttpWebclientExtensions.cs @@ -1,5 +1,3 @@ -#region License - // /* // * Copyright 2018 the original author or authors. // * @@ -16,8 +14,6 @@ // * limitations under the License. // */ -#endregion - using NUnitAspEx; using NUnitAspEx.Client; diff --git a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Conversation/PatialEndConvBeginBasePage.cs b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Conversation/PatialEndConvBeginBasePage.cs index 10b77a1b..11d14900 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Conversation/PatialEndConvBeginBasePage.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Conversation/PatialEndConvBeginBasePage.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Web.UI; namespace Spring.Web.Conversation; diff --git a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Conversation/PatialEndConvEndBasePage.cs b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Conversation/PatialEndConvEndBasePage.cs index ee22caa7..9be60680 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Conversation/PatialEndConvEndBasePage.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Conversation/PatialEndConvEndBasePage.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Web.UI; namespace Spring.Web.Conversation; diff --git a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Conversation/SerializeConversationTestModule.cs b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Conversation/SerializeConversationTestModule.cs index 752ca028..f673399d 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Conversation/SerializeConversationTestModule.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Conversation/SerializeConversationTestModule.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Web; using System.Runtime.Serialization.Formatters.Binary; using System.Runtime.Serialization; @@ -32,19 +28,13 @@ namespace Spring.Web.Conversation; /// public class SerializeConversationTestModule : IHttpModule { - #region Logging - private static readonly ILogger LOG = LogManager.GetLogger(); - #endregion - /// /// Serialized Session Content. /// private static MemoryStream SerializedSessionContentStream = new MemoryStream(); - #region IHttpModule Members - /// /// TODO: /// @@ -133,14 +123,10 @@ public class SerializeConversationTestModule : IHttpModule } } } - - #endregion } public class MyBinder : SerializationBinder { - #region Logging - private ILog LOG { get @@ -149,8 +135,6 @@ public class MyBinder : SerializationBinder } } - #endregion - public override Type BindToType(string assemblyName, string typeName) { if (LOG.IsEnabled(LogLevel.Debug)) @@ -201,14 +185,8 @@ public class MyBinder : SerializationBinder /// public class MySerializationSurrogate : ISerializationSurrogate { - #region Logging - private static readonly ILogger LOG = LogManager.GetLogger(); - #endregion - - #region ISerializationSurrogate Members - public void GetObjectData(object obj, SerializationInfo info, StreamingContext context) { if (LOG.IsEnabled(LogLevel.Debug)) @@ -251,6 +229,4 @@ public class MySerializationSurrogate : ISerializationSurrogate return obj; } - - #endregion } diff --git a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Conversation/SimpleTest.cs b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Conversation/SimpleTest.cs index 49b3db14..a9bf1576 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Conversation/SimpleTest.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Conversation/SimpleTest.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; namespace Spring.Web.Conversation; diff --git a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Conversation/WebConversationStateTest.cs b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Conversation/WebConversationStateTest.cs index 176cd4ee..207f1e7e 100644 Binary files a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Conversation/WebConversationStateTest.cs and b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Conversation/WebConversationStateTest.cs differ diff --git a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Data/Spring/Conversation/WebConversationStateTest/CircularDependenceTest.aspx.cs b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Data/Spring/Conversation/WebConversationStateTest/CircularDependenceTest.aspx.cs index 87ec253c..d2b0e800 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Data/Spring/Conversation/WebConversationStateTest/CircularDependenceTest.aspx.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Data/Spring/Conversation/WebConversationStateTest/CircularDependenceTest.aspx.cs @@ -35,14 +35,10 @@ public partial class CircularDependenceTest : System.Web.UI.Page, IApplicationCo Session["CircularDependenceTest"] = sbErrors.ToString(); } - #region IApplicationContextAware Members - private IApplicationContext applicationContext; public IApplicationContext ApplicationContext { set { this.applicationContext = value; } } - - #endregion } diff --git a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Data/Spring/Conversation/WebConversationStateTest/ConnectionReleaseModeIssue.aspx.cs b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Data/Spring/Conversation/WebConversationStateTest/ConnectionReleaseModeIssue.aspx.cs index 3d700005..f36d9b7b 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Data/Spring/Conversation/WebConversationStateTest/ConnectionReleaseModeIssue.aspx.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Data/Spring/Conversation/WebConversationStateTest/ConnectionReleaseModeIssue.aspx.cs @@ -244,14 +244,10 @@ public partial class ConnectionReleaseModeIssue : System.Web.UI.Page, IApplicati pInfoConnectionReleaseMode.SetValue(settings, mode, null); } - #region IApplicationContextAware Members - private IApplicationContext applicationContext; public IApplicationContext ApplicationContext { set { this.applicationContext = value; } } - - #endregion } diff --git a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Entities/SPCDetailEnt.cs b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Entities/SPCDetailEnt.cs index 9ceba846..4c90688e 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Entities/SPCDetailEnt.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Entities/SPCDetailEnt.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Web.Conversation; namespace Spring.Entities; diff --git a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Entities/SPCMasterEnt.cs b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Entities/SPCMasterEnt.cs index a4f0a4e4..980423f3 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Entities/SPCMasterEnt.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Entities/SPCMasterEnt.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Web.Conversation; namespace Spring.Entities; diff --git a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Spring/Data/Common/ConnectionCreationTrackingDbProvider.cs b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Spring/Data/Common/ConnectionCreationTrackingDbProvider.cs index a27525a1..6a16abbc 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Spring/Data/Common/ConnectionCreationTrackingDbProvider.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Spring/Data/Common/ConnectionCreationTrackingDbProvider.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using Spring.Data.Common; using System.Data; diff --git a/test/Spring/Spring.Web.Mvc5.Tests/ControllerFactoryTestExtension.cs b/test/Spring/Spring.Web.Mvc5.Tests/ControllerFactoryTestExtension.cs index 232a2a0a..64c4ff6f 100644 --- a/test/Spring/Spring.Web.Mvc5.Tests/ControllerFactoryTestExtension.cs +++ b/test/Spring/Spring.Web.Mvc5.Tests/ControllerFactoryTestExtension.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Web.Mvc; using System.Reflection; diff --git a/test/Spring/Spring.Web.Mvc5.Tests/Controllers/FirstContainerRegisteredController.cs b/test/Spring/Spring.Web.Mvc5.Tests/Controllers/FirstContainerRegisteredController.cs index 2cb346e1..2e3629f5 100644 --- a/test/Spring/Spring.Web.Mvc5.Tests/Controllers/FirstContainerRegisteredController.cs +++ b/test/Spring/Spring.Web.Mvc5.Tests/Controllers/FirstContainerRegisteredController.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Web.Mvc; namespace Spring.Web.Mvc.Tests.Controllers; diff --git a/test/Spring/Spring.Web.Mvc5.Tests/Controllers/NamedContextController.cs b/test/Spring/Spring.Web.Mvc5.Tests/Controllers/NamedContextController.cs index 6140e692..ec99e03d 100644 --- a/test/Spring/Spring.Web.Mvc5.Tests/Controllers/NamedContextController.cs +++ b/test/Spring/Spring.Web.Mvc5.Tests/Controllers/NamedContextController.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Web.Mvc; namespace Spring.Web.Mvc.Tests.Controllers; diff --git a/test/Spring/Spring.Web.Mvc5.Tests/Controllers/NotInContainerController.cs b/test/Spring/Spring.Web.Mvc5.Tests/Controllers/NotInContainerController.cs index e822a84f..8ea356ac 100644 --- a/test/Spring/Spring.Web.Mvc5.Tests/Controllers/NotInContainerController.cs +++ b/test/Spring/Spring.Web.Mvc5.Tests/Controllers/NotInContainerController.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Web.Mvc; namespace Spring.Web.Mvc.Tests.Controllers; diff --git a/test/Spring/Spring.Web.Mvc5.Tests/Controllers/SecondContainerRegisteredController.cs b/test/Spring/Spring.Web.Mvc5.Tests/Controllers/SecondContainerRegisteredController.cs index 4edbf428..cf2628ba 100644 --- a/test/Spring/Spring.Web.Mvc5.Tests/Controllers/SecondContainerRegisteredController.cs +++ b/test/Spring/Spring.Web.Mvc5.Tests/Controllers/SecondContainerRegisteredController.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Web.Mvc; namespace Spring.Web.Mvc.Tests.Controllers; diff --git a/test/Spring/Spring.Web.Mvc5.Tests/SpringMvcDependencyResolverTests.cs b/test/Spring/Spring.Web.Mvc5.Tests/SpringMvcDependencyResolverTests.cs index b7185e4d..6847e49d 100644 --- a/test/Spring/Spring.Web.Mvc5.Tests/SpringMvcDependencyResolverTests.cs +++ b/test/Spring/Spring.Web.Mvc5.Tests/SpringMvcDependencyResolverTests.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Web.Mvc; using NUnit.Framework; using Spring.Context.Support; @@ -28,8 +24,6 @@ namespace Spring.Web.Mvc.Tests; [TestFixture] public class SpringMvcDependencyResolverTests { - #region Setup/Teardown - [SetUp] public void _TestSetup() { @@ -45,8 +39,6 @@ public class SpringMvcDependencyResolverTests _resolver.ApplicationContextName = string.Empty; } - #endregion - private MvcApplicationContext _context; private MvcApplicationContext _mvcNamedContext; private SpringMvcDependencyResolver _resolver; diff --git a/test/Spring/Spring.Web.Tests/AssemblyInfo.cs b/test/Spring/Spring.Web.Tests/AssemblyInfo.cs index e0017bd5..c963c351 100644 --- a/test/Spring/Spring.Web.Tests/AssemblyInfo.cs +++ b/test/Spring/Spring.Web.Tests/AssemblyInfo.cs @@ -1,7 +1,5 @@ -#region License - /* - * Copyright © 2002-2011 the original author or authors. + * Copyright � 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Reflection; [assembly: AssemblyTitle("Spring.Web Tests")] diff --git a/test/Spring/Spring.Web.Tests/Caching/AspNetCacheTests.cs b/test/Spring/Spring.Web.Tests/Caching/AspNetCacheTests.cs index 012d8e9e..45475bc0 100644 --- a/test/Spring/Spring.Web.Tests/Caching/AspNetCacheTests.cs +++ b/test/Spring/Spring.Web.Tests/Caching/AspNetCacheTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Collections; using System.Web; using System.Web.Caching; diff --git a/test/Spring/Spring.Web.Tests/Context/Support/HttpApplicationConfigurerTests.cs b/test/Spring/Spring.Web.Tests/Context/Support/HttpApplicationConfigurerTests.cs index 7a091eb0..8a4ba5cd 100644 --- a/test/Spring/Spring.Web.Tests/Context/Support/HttpApplicationConfigurerTests.cs +++ b/test/Spring/Spring.Web.Tests/Context/Support/HttpApplicationConfigurerTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Configuration; using System.Reflection; using System.Web; @@ -28,8 +22,6 @@ using Spring.Objects.Factory.Config; using Spring.Objects.Factory.Support; using Spring.Objects.Factory.Xml; -#endregion - namespace Spring.Context.Support; /// @@ -235,8 +227,6 @@ public class HttpApplicationConfigurerTests return appContext; } - #region Test Classes - public class ModuleEntry { // Fields @@ -296,6 +286,4 @@ public class HttpApplicationConfigurerTests { } } - - #endregion } diff --git a/test/Spring/Spring.Web.Tests/Context/Support/WebApplicationContextTests.cs b/test/Spring/Spring.Web.Tests/Context/Support/WebApplicationContextTests.cs index 86d6268c..09cdb937 100644 --- a/test/Spring/Spring.Web.Tests/Context/Support/WebApplicationContextTests.cs +++ b/test/Spring/Spring.Web.Tests/Context/Support/WebApplicationContextTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using NUnitAspEx; using Spring.Objects.Factory; using Spring.TestSupport; using Spring.Threading; -#endregion - namespace Spring.Context.Support; /// diff --git a/test/Spring/Spring.Web.Tests/Context/Support/WebContextHandlerTests.cs b/test/Spring/Spring.Web.Tests/Context/Support/WebContextHandlerTests.cs index cdb5d371..0e3aed66 100644 --- a/test/Spring/Spring.Web.Tests/Context/Support/WebContextHandlerTests.cs +++ b/test/Spring/Spring.Web.Tests/Context/Support/WebContextHandlerTests.cs @@ -1,6 +1,4 @@ -#region License - -/* +/* * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Xml; using NUnit.Framework; -#endregion - namespace Spring.Context.Support; public class WebContextHandlerTests diff --git a/test/Spring/Spring.Web.Tests/Core/IO/WebResourceTests.cs b/test/Spring/Spring.Web.Tests/Core/IO/WebResourceTests.cs index 3fda200b..6ea2566b 100644 --- a/test/Spring/Spring.Web.Tests/Core/IO/WebResourceTests.cs +++ b/test/Spring/Spring.Web.Tests/Core/IO/WebResourceTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.TestSupport; -#endregion - namespace Spring.Core.IO; /// diff --git a/test/Spring/Spring.Web.Tests/Globalization/Resolvers/DefaultWebCultureResolverTests.cs b/test/Spring/Spring.Web.Tests/Globalization/Resolvers/DefaultWebCultureResolverTests.cs index 68425933..06743468 100644 --- a/test/Spring/Spring.Web.Tests/Globalization/Resolvers/DefaultWebCultureResolverTests.cs +++ b/test/Spring/Spring.Web.Tests/Globalization/Resolvers/DefaultWebCultureResolverTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Globalization; using NUnit.Framework; -#endregion - namespace Spring.Globalization.Resolvers; /// @@ -34,8 +26,6 @@ namespace Spring.Globalization.Resolvers; [TestFixture] public class DefaultWebCultureResolverTests { - #region TestDefaultWebCultureResolver utility class - /// /// Override GetRequestLanguage() to return test language instead of HttpRequest.UserLanguages[0] /// @@ -57,8 +47,6 @@ public class DefaultWebCultureResolverTests } } - #endregion - private readonly CultureInfo EXPECTED_NEUTRALCULTURE = new CultureInfo("fr"); [OneTimeSetUp] diff --git a/test/Spring/Spring.Web.Tests/Objects/Factory/Support/WebObjectDefinitionFactoryTests.cs b/test/Spring/Spring.Web.Tests/Objects/Factory/Support/WebObjectDefinitionFactoryTests.cs index 3d162b69..9ceb3307 100644 --- a/test/Spring/Spring.Web.Tests/Objects/Factory/Support/WebObjectDefinitionFactoryTests.cs +++ b/test/Spring/Spring.Web.Tests/Objects/Factory/Support/WebObjectDefinitionFactoryTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using NUnitAspEx; using Spring.TestSupport; -#endregion - namespace Spring.Objects.Factory.Support; /// diff --git a/test/Spring/Spring.Web.Tests/Objects/Factory/Support/WebObjectDefinitionTests.cs b/test/Spring/Spring.Web.Tests/Objects/Factory/Support/WebObjectDefinitionTests.cs index 2ef97a0d..99b22821 100644 --- a/test/Spring/Spring.Web.Tests/Objects/Factory/Support/WebObjectDefinitionTests.cs +++ b/test/Spring/Spring.Web.Tests/Objects/Factory/Support/WebObjectDefinitionTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using Spring.Objects.Factory.Config; diff --git a/test/Spring/Spring.Web.Tests/Objects/Factory/Support/WebObjectFactoryTests.cs b/test/Spring/Spring.Web.Tests/Objects/Factory/Support/WebObjectFactoryTests.cs index 4d657d13..3fa8d316 100644 --- a/test/Spring/Spring.Web.Tests/Objects/Factory/Support/WebObjectFactoryTests.cs +++ b/test/Spring/Spring.Web.Tests/Objects/Factory/Support/WebObjectFactoryTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Objects.Factory.Config; using Spring.TestSupport; -#endregion - namespace Spring.Objects.Factory.Support; /// diff --git a/test/Spring/Spring.Web.Tests/Objects/Factory/Support/WebObjectUtilsTests.cs b/test/Spring/Spring.Web.Tests/Objects/Factory/Support/WebObjectUtilsTests.cs index eeb17117..25c61d6a 100644 --- a/test/Spring/Spring.Web.Tests/Objects/Factory/Support/WebObjectUtilsTests.cs +++ b/test/Spring/Spring.Web.Tests/Objects/Factory/Support/WebObjectUtilsTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; namespace Spring.Objects.Factory.Support; diff --git a/test/Spring/Spring.Web.Tests/Objects/Factory/Xml/WebObjectDefinitionReaderTests.cs b/test/Spring/Spring.Web.Tests/Objects/Factory/Xml/WebObjectDefinitionReaderTests.cs index 00c4c150..f17ffb3c 100644 --- a/test/Spring/Spring.Web.Tests/Objects/Factory/Xml/WebObjectDefinitionReaderTests.cs +++ b/test/Spring/Spring.Web.Tests/Objects/Factory/Xml/WebObjectDefinitionReaderTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Xml; using NUnit.Framework; using Spring.Core.IO; diff --git a/test/Spring/Spring.Web.Tests/TestSupport/NUnitAdapter.cs b/test/Spring/Spring.Web.Tests/TestSupport/NUnitAdapter.cs index e88042f7..920a4991 100644 --- a/test/Spring/Spring.Web.Tests/TestSupport/NUnitAdapter.cs +++ b/test/Spring/Spring.Web.Tests/TestSupport/NUnitAdapter.cs @@ -1,5 +1,3 @@ -#region Copyright (c) 2002, 2005 by James Shore - /******************************************************************************************************************** ' ' Copyright (c) 2002, 2005 by James Shore @@ -20,10 +18,6 @@ ' '******************************************************************************************************************/ -#endregion - -#region Instructions - /******************************************************************************************************************** * * This file allows NUnitAsp to be used with NUnit. To use, copy this file @@ -33,8 +27,6 @@ * *******************************************************************************************************************/ -#endregion - using NUnit.Extensions.Asp; using NUnit.Framework; diff --git a/test/Spring/Spring.Web.Tests/TestSupport/TestWebContext.cs b/test/Spring/Spring.Web.Tests/TestSupport/TestWebContext.cs index 6868792e..e95f04e8 100644 --- a/test/Spring/Spring.Web.Tests/TestSupport/TestWebContext.cs +++ b/test/Spring/Spring.Web.Tests/TestSupport/TestWebContext.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,17 +14,11 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Web; using System.Web.Hosting; using Spring.Collections; using Spring.Expressions; -#endregion - namespace Spring.TestSupport; public class TestWebContext : IDisposable diff --git a/test/Spring/Spring.Web.Tests/TestSupport/TestWebContextTests.cs b/test/Spring/Spring.Web.Tests/TestSupport/TestWebContextTests.cs index a5907121..d6db59df 100644 --- a/test/Spring/Spring.Web.Tests/TestSupport/TestWebContextTests.cs +++ b/test/Spring/Spring.Web.Tests/TestSupport/TestWebContextTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Globalization; -#endregion - namespace Spring.TestSupport; /// diff --git a/test/Spring/Spring.Web.Tests/TestSupport/WebApplicationTests.cs b/test/Spring/Spring.Web.Tests/TestSupport/WebApplicationTests.cs index cd2f5698..c348a645 100644 --- a/test/Spring/Spring.Web.Tests/TestSupport/WebApplicationTests.cs +++ b/test/Spring/Spring.Web.Tests/TestSupport/WebApplicationTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using NUnit.Framework; using NUnitAspEx; using NUnitAspEx.Core; diff --git a/test/Spring/Spring.Web.Tests/Threading/HttpContextStorageTests.cs b/test/Spring/Spring.Web.Tests/Threading/HttpContextStorageTests.cs index 8a611492..5c66b962 100644 --- a/test/Spring/Spring.Web.Tests/Threading/HttpContextStorageTests.cs +++ b/test/Spring/Spring.Web.Tests/Threading/HttpContextStorageTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Web; using NUnit.Framework; -#endregion - namespace Spring.Threading; /// diff --git a/test/Spring/Spring.Web.Tests/Threading/HybridContextStorageTests.cs b/test/Spring/Spring.Web.Tests/Threading/HybridContextStorageTests.cs index 0c6efa75..ba62f486 100644 --- a/test/Spring/Spring.Web.Tests/Threading/HybridContextStorageTests.cs +++ b/test/Spring/Spring.Web.Tests/Threading/HybridContextStorageTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Web; using NUnit.Framework; -#endregion - namespace Spring.Threading; /// diff --git a/test/Spring/Spring.Web.Tests/Util/WebDIPerformanceTests.cs b/test/Spring/Spring.Web.Tests/Util/WebDIPerformanceTests.cs index 256312b7..aaeceb65 100644 --- a/test/Spring/Spring.Web.Tests/Util/WebDIPerformanceTests.cs +++ b/test/Spring/Spring.Web.Tests/Util/WebDIPerformanceTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Data; using System.Web.UI.WebControls; using NUnit.Framework; @@ -28,8 +22,6 @@ using Spring.Context.Support; using Spring.TestSupport; using System.Collections; -#endregion - namespace Spring.Util; [TestFixture] diff --git a/test/Spring/Spring.Web.Tests/Util/WebUtilsTests.cs b/test/Spring/Spring.Web.Tests/Util/WebUtilsTests.cs index 80cbdd61..e61d824a 100644 --- a/test/Spring/Spring.Web.Tests/Util/WebUtilsTests.cs +++ b/test/Spring/Spring.Web.Tests/Util/WebUtilsTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.TestSupport; -#endregion - namespace Spring.Util; /// diff --git a/test/Spring/Spring.Web.Tests/Web/Services/WebServiceExporterTests.cs b/test/Spring/Spring.Web.Tests/Web/Services/WebServiceExporterTests.cs index f330c28e..c660b6d9 100644 --- a/test/Spring/Spring.Web.Tests/Web/Services/WebServiceExporterTests.cs +++ b/test/Spring/Spring.Web.Tests/Web/Services/WebServiceExporterTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,10 +14,6 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Text; using System.Reflection; using System.Reflection.Emit; @@ -30,8 +24,6 @@ using Spring.Core.IO; using Spring.Objects.Factory.Xml; using Spring.Objects.Factory; -#endregion - namespace Spring.Web.Services; /// @@ -290,8 +282,6 @@ public sealed class WebServiceExporterTests Assert.IsTrue(typeof(CustomWebService).IsAssignableFrom(proxyType)); } - #region Test classes - public interface IService { string SomeMethod(int param); @@ -319,6 +309,4 @@ public sealed class WebServiceExporterTests public class CustomWebService : WebService { } - - #endregion } diff --git a/test/Spring/Spring.Web.Tests/Web/Support/AbstractHandlerFactoryTests.cs b/test/Spring/Spring.Web.Tests/Web/Support/AbstractHandlerFactoryTests.cs index 02b268c4..2463e006 100644 --- a/test/Spring/Spring.Web.Tests/Web/Support/AbstractHandlerFactoryTests.cs +++ b/test/Spring/Spring.Web.Tests/Web/Support/AbstractHandlerFactoryTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Web; using FakeItEasy; using NUnit.Framework; @@ -33,8 +29,6 @@ namespace Spring.Web.Support; [TestFixture] public class AbstractHandlerFactoryTests { - #region TestFindWebObjectDefinition Helper - private class TestFindWebObjectDefinitionHandlerFactory : AbstractHandlerFactory { private class Type1 @@ -73,18 +67,12 @@ public class AbstractHandlerFactoryTests return FindWebObjectDefinition(url, of); } - #region AbstractHandlerFactory implementations - protected override IHttpHandler CreateHandlerInstance(IConfigurableApplicationContext appContext, HttpContext context, string requestType, string url, string physicalPath) { throw new NotImplementedException(); } - - #endregion } - #endregion TestFindWebObjectDefinition Helper - [Test] public void FindWebObjectDefinition() { @@ -92,8 +80,6 @@ public class AbstractHandlerFactoryTests f.TestFindWebObjectDefinition(); } - #region TestHandlerFactory - public abstract class TestHandlerFactory : AbstractHandlerFactory { public new IConfigurableApplicationContext GetCheckedApplicationContext(string virtualPath) @@ -116,8 +102,6 @@ public class AbstractHandlerFactoryTests public abstract IApplicationContext GetContextStub(string virtualPath); } - #endregion - [Test] public void GetCheckedApplicationContextThrowsExceptionsOnNonConfigurableContexts() { diff --git a/test/Spring/Spring.Web.Tests/Web/Support/ControlInterceptionTests.cs b/test/Spring/Spring.Web.Tests/Web/Support/ControlInterceptionTests.cs index 9bc44108..6e7b47e7 100644 --- a/test/Spring/Spring.Web.Tests/Web/Support/ControlInterceptionTests.cs +++ b/test/Spring/Spring.Web.Tests/Web/Support/ControlInterceptionTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Web.UI; using NUnit.Framework; using Spring.Context; using Spring.Context.Support; using Spring.TestSupport; -#endregion - namespace Spring.Web.Support; /// @@ -176,8 +168,6 @@ public class ControlInterceptionTests } } -#region Test Support Classes - public class MockControl : UserControl, IApplicationContextAware { private bool _gotIt = false; @@ -284,10 +274,6 @@ public class ControlSupportingWebDI : Control, ISupportsWebDependencyInjection } } -#endregion Test Support Classes - -#region DI Templates // look at them using reflector - internal class DIControlCollection : ControlCollection, ISupportsWebDependencyInjection { private IApplicationContext _defaultApplicationContext; @@ -313,6 +299,4 @@ internal class DIControlCollection : ControlCollection, ISupportsWebDependencyIn child = WebDependencyInjectionUtils.InjectDependenciesRecursive(_defaultApplicationContext, child); base.AddAt(index, child); } -} - -#endregion +} \ No newline at end of file diff --git a/test/Spring/Spring.Web.Tests/Web/Support/LocalResourceManagerTests.cs b/test/Spring/Spring.Web.Tests/Web/Support/LocalResourceManagerTests.cs index 659d3535..d64a7cec 100644 --- a/test/Spring/Spring.Web.Tests/Web/Support/LocalResourceManagerTests.cs +++ b/test/Spring/Spring.Web.Tests/Web/Support/LocalResourceManagerTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Diagnostics; using NUnit.Framework; using NUnitAspEx.Client; diff --git a/test/Spring/Spring.Web.Tests/Web/Support/MimeMediaTypeTests.cs b/test/Spring/Spring.Web.Tests/Web/Support/MimeMediaTypeTests.cs index ec9465d6..00719cbb 100644 --- a/test/Spring/Spring.Web.Tests/Web/Support/MimeMediaTypeTests.cs +++ b/test/Spring/Spring.Web.Tests/Web/Support/MimeMediaTypeTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,14 +14,8 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; -#endregion - namespace Spring.Web.Support; /// diff --git a/test/Spring/Spring.Web.Tests/Web/Support/PageHandlerFactoryTests.cs b/test/Spring/Spring.Web.Tests/Web/Support/PageHandlerFactoryTests.cs index 14b92fd2..319184cf 100644 --- a/test/Spring/Spring.Web.Tests/Web/Support/PageHandlerFactoryTests.cs +++ b/test/Spring/Spring.Web.Tests/Web/Support/PageHandlerFactoryTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Web; using NUnit.Framework; using NUnitAspEx; using NUnitAspEx.Client; using Spring.TestSupport; -#endregion - namespace Spring.Web.Support; /// diff --git a/test/Spring/Spring.Web.Tests/Web/Support/ResultFactoryRegistryTests.cs b/test/Spring/Spring.Web.Tests/Web/Support/ResultFactoryRegistryTests.cs index fcc90663..a802b392 100644 --- a/test/Spring/Spring.Web.Tests/Web/Support/ResultFactoryRegistryTests.cs +++ b/test/Spring/Spring.Web.Tests/Web/Support/ResultFactoryRegistryTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using FakeItEasy; using NUnit.Framework; diff --git a/test/Spring/Spring.Web.Tests/Web/Support/ResultTests.cs b/test/Spring/Spring.Web.Tests/Web/Support/ResultTests.cs index b33fbb0c..95ef3e77 100644 --- a/test/Spring/Spring.Web.Tests/Web/Support/ResultTests.cs +++ b/test/Spring/Spring.Web.Tests/Web/Support/ResultTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using NUnit.Framework; using Spring.Util; -#endregion - namespace Spring.Web.Support; /// diff --git a/test/Spring/Spring.Web.Tests/Web/UI/Controls/AbstractValidationControlTests.cs b/test/Spring/Spring.Web.Tests/Web/UI/Controls/AbstractValidationControlTests.cs index 07dbdfb5..871a0d29 100644 --- a/test/Spring/Spring.Web.Tests/Web/UI/Controls/AbstractValidationControlTests.cs +++ b/test/Spring/Spring.Web.Tests/Web/UI/Controls/AbstractValidationControlTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using System.Web.UI; using FakeItEasy; @@ -266,8 +262,6 @@ public class AbstractValidationControlTests Assert.AreEqual(1, outerVC.TheValidationContainer.ValidationErrors.GetErrors("provider").Count); } - #region TestValidationControl - private class TestValidationControl : AbstractValidationControl { public class CapturingRenderer : IValidationErrorsRenderer @@ -332,6 +326,4 @@ public class AbstractValidationControlTests get { return base.DesignMode; } } } - - #endregion } diff --git a/test/Spring/Spring.Web.Tests/Web/UI/Controls/HeadTests.cs b/test/Spring/Spring.Web.Tests/Web/UI/Controls/HeadTests.cs index 21d2eed5..c3709ec5 100644 --- a/test/Spring/Spring.Web.Tests/Web/UI/Controls/HeadTests.cs +++ b/test/Spring/Spring.Web.Tests/Web/UI/Controls/HeadTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Web; using System.Web.UI; using System.Web.UI.HtmlControls; using NUnit.Framework; using Spring.TestSupport; -#endregion - namespace Spring.Web.UI.Controls; /// diff --git a/test/Spring/Spring.Web.Tests/Web/UI/Controls/ValidationErrorsTests.cs b/test/Spring/Spring.Web.Tests/Web/UI/Controls/ValidationErrorsTests.cs index 39d6ffe5..f8d9a87a 100644 --- a/test/Spring/Spring.Web.Tests/Web/UI/Controls/ValidationErrorsTests.cs +++ b/test/Spring/Spring.Web.Tests/Web/UI/Controls/ValidationErrorsTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Web.UI.Validation; -#endregion - namespace Spring.Web.UI.Controls; /// diff --git a/test/Spring/Spring.Web.Tests/Web/UI/Controls/ValidationSummaryTests.cs b/test/Spring/Spring.Web.Tests/Web/UI/Controls/ValidationSummaryTests.cs index 6dedc005..4301371a 100644 --- a/test/Spring/Spring.Web.Tests/Web/UI/Controls/ValidationSummaryTests.cs +++ b/test/Spring/Spring.Web.Tests/Web/UI/Controls/ValidationSummaryTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,15 +14,9 @@ * limitations under the License. */ -#endregion - -#region Imports - using NUnit.Framework; using Spring.Web.UI.Validation; -#endregion - namespace Spring.Web.UI.Controls; /// diff --git a/test/Spring/Spring.Web.Tests/Web/UI/PageTests.cs b/test/Spring/Spring.Web.Tests/Web/UI/PageTests.cs index d5cdcf60..cf42cb46 100644 --- a/test/Spring/Spring.Web.Tests/Web/UI/PageTests.cs +++ b/test/Spring/Spring.Web.Tests/Web/UI/PageTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2002-2010 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Globalization; using System.Web; using FakeItEasy; diff --git a/test/Spring/Spring.Web.Tests/Web/UI/SessionModelPersistenceMediumTests.cs b/test/Spring/Spring.Web.Tests/Web/UI/SessionModelPersistenceMediumTests.cs index dbbbce6d..715a19b9 100644 --- a/test/Spring/Spring.Web.Tests/Web/UI/SessionModelPersistenceMediumTests.cs +++ b/test/Spring/Spring.Web.Tests/Web/UI/SessionModelPersistenceMediumTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright � 2002-2011 the original author or authors. * @@ -16,18 +14,12 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Collections; using System.Web.UI; using NUnit.Framework; using Spring.Collections; using Spring.TestSupport; -#endregion - namespace Spring.Web.UI; /// diff --git a/test/Spring/Spring.Web.Tests/Web/UI/UserControlTests.cs b/test/Spring/Spring.Web.Tests/Web/UI/UserControlTests.cs index 1e243c76..bc6308c4 100644 --- a/test/Spring/Spring.Web.Tests/Web/UI/UserControlTests.cs +++ b/test/Spring/Spring.Web.Tests/Web/UI/UserControlTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright © 2002-2011 the original author or authors. * @@ -16,8 +14,6 @@ * limitations under the License. */ -#endregion - using System.Web; using System.Web.UI; using FakeItEasy; diff --git a/test/Spring/Spring.Web.Tests/WebCompilerOptionsTests.cs b/test/Spring/Spring.Web.Tests/WebCompilerOptionsTests.cs index d74e5eac..2b7bcbf4 100644 --- a/test/Spring/Spring.Web.Tests/WebCompilerOptionsTests.cs +++ b/test/Spring/Spring.Web.Tests/WebCompilerOptionsTests.cs @@ -1,5 +1,3 @@ -#region License - /* * Copyright 2004-2009 the original author or authors. * @@ -16,16 +14,10 @@ * limitations under the License. */ -#endregion - -#region Imports - using System.Reflection; using NUnit.Framework; using Spring.Context.Support; -#endregion - namespace Spring; /// Test that the assembly is built with the correct DebugAttributes in release and debug builds.