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

Enable implicit usings (#224)

Browse Source
This commit is contained in:
Marko Lahma
2022-07-16 22:45:23 +03:00
committed by GitHub
parent c1494dd636
commit 7b163f006e
1111 changed files with 5943 additions and 8486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build-support/nuke-build/Configuration.cs
View File

@@ -1,6 +1,4 @@
using System;
using System.ComponentModel;
using System.Linq;
using Nuke.Common.Tooling;
[TypeConverter(typeof(TypeConverter<Configuration>))]

22
src/Directory.Build.props
View File

@@ -17,13 +17,13 @@
<Company>SpringSource</Company>
<Copyright>Copyright 2002-2021 Spring.NET Framework Team.</Copyright>
<Trademark>Apache License, Version 2.0</Trademark>
<CommonLoggingVersion>3.4.1</CommonLoggingVersion>
<Authors>SpringSource</Authors>
<PackageIcon>SpringSource_Leaves32x32.png</PackageIcon>
<PackageIcon>SpringSource_Leaves32x32.png</PackageIcon>
<PackageIconUrl>https://springframework.net/images/SpringSource_Leaves32x32.png</PackageIconUrl>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageProjectUrl>https://www.springframework.net/</PackageProjectUrl>
<PackageTags>Library</PackageTags>
@@ -45,27 +45,29 @@
<LangVersion>latest</LangVersion>
<TargetFullFrameworkVersion>net462</TargetFullFrameworkVersion>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<ItemGroup Condition="'$(SourceLinkEnabled)' != 'false'">
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="4.0.0" PrivateAssets="All" />
<PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="5.0.0.1" PrivateAssets="All"/>
</ItemGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<DebugType>Full</DebugType>
<DebugType>Full</DebugType>
<DefineConstants>$(DefineConstants);DEBUG_DYNAMIC;</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>TRACE;$(DefineConstants)</DefineConstants>
</PropertyGroup>
<ItemGroup>
<None Include="..\..\SpringSource_Leaves32x32.png" Pack="true" Visible="false" PackagePath=""/>
</ItemGroup>
</ItemGroup>
</Project>

57
src/Spring/Spring.Aop/Aop/Config/AopNamespaceUtils.cs
View File

@@ -20,7 +20,6 @@
#region Imports
using System;
using System.Xml;
using Spring.Aop.Framework.AutoProxy;
using Spring.Objects.Factory.Config;
@@ -38,48 +37,48 @@ namespace Spring.Aop.Config
/// </summary>
/// <author>Rob Harrop</author>
/// <author>Juergen Hoeller</author>
/// <author>Mark Pollack (.NET)</author>
/// <author>Mark Pollack (.NET)</author>
/// <author>Erich Eichinger (.NET)</author>
public class AopNamespaceUtils
{
/// <summary>
/// The object name of the internally managed auto-proxy creator.
/// </summary>
public static readonly string AUTO_PROXY_CREATOR_OBJECT_NAME = "Spring.Aop.Config.InternalAutoProxyCreator";
/// <summary>
/// The type of the APC that handles advisors with object role <see cref="ObjectRole.ROLE_INFRASTRUCTURE"/>.
/// </summary>
public static readonly string AUTO_PROXY_CREATOR_OBJECT_NAME = "Spring.Aop.Config.InternalAutoProxyCreator";
/// <summary>
/// The type of the APC that handles advisors with object role <see cref="ObjectRole.ROLE_INFRASTRUCTURE"/>.
/// </summary>
private static readonly Type InfrastructureAutoProxyCreatorType = typeof(InfrastructureAdvisorAutoProxyCreator);
/// <summary>
/// Registers the internal auto proxy creator if necessary.
/// </summary>
/// <param name="parserContext">The parser context.</param>
/// <param name="sourceElement">The source element.</param>
public static void RegisterAutoProxyCreatorIfNecessary(ParserContext parserContext, XmlElement sourceElement)
{
AssertUtils.ArgumentNotNull(parserContext, "parserContext");
IObjectDefinitionRegistry registry = parserContext.Registry;
{
AssertUtils.ArgumentNotNull(parserContext, "parserContext");
IObjectDefinitionRegistry registry = parserContext.Registry;
RegisterAutoProxyCreatorIfNecessary(registry);
}
/// <summary>
/// Registers the internal auto proxy creator if necessary.
/// </summary>
public static void RegisterAutoProxyCreatorIfNecessary(IObjectDefinitionRegistry registry)
{
AssertUtils.ArgumentNotNull(registry, "registry");
if (!registry.ContainsObjectDefinition(AUTO_PROXY_CREATOR_OBJECT_NAME))
{
RootObjectDefinition objectDefinition = new RootObjectDefinition(InfrastructureAutoProxyCreatorType);
objectDefinition.Role = ObjectRole.ROLE_INFRASTRUCTURE;
objectDefinition.PropertyValues.Add("order", int.MaxValue);
registry.RegisterObjectDefinition(AUTO_PROXY_CREATOR_OBJECT_NAME, objectDefinition);
}
}
}
/// <summary>
/// Registers the internal auto proxy creator if necessary.
/// </summary>
public static void RegisterAutoProxyCreatorIfNecessary(IObjectDefinitionRegistry registry)
{
AssertUtils.ArgumentNotNull(registry, "registry");
if (!registry.ContainsObjectDefinition(AUTO_PROXY_CREATOR_OBJECT_NAME))
{
RootObjectDefinition objectDefinition = new RootObjectDefinition(InfrastructureAutoProxyCreatorType);
objectDefinition.Role = ObjectRole.ROLE_INFRASTRUCTURE;
objectDefinition.PropertyValues.Add("order", int.MaxValue);
registry.RegisterObjectDefinition(AUTO_PROXY_CREATOR_OBJECT_NAME, objectDefinition);
}
}
/// <summary>
/// Forces the auto proxy creator to use decorator proxy.
/// </summary>

13
src/Spring/Spring.Aop/Aop/Framework/AbstractMethodInvocation.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,7 +20,6 @@
#region Imports
using System;
using System.Collections;
using System.Reflection;
using System.Text;
@@ -293,7 +292,7 @@ namespace Spring.Aop.Framework
}
/// <summary>
/// Retrieves a new <see cref="AopAlliance.Intercept.IMethodInvocation"/> instance
/// Retrieves a new <see cref="AopAlliance.Intercept.IMethodInvocation"/> instance
/// for the next Proceed method call.
/// </summary>
/// <param name="invocation">
@@ -318,7 +317,7 @@ namespace Spring.Aop.Framework
protected virtual void AssertJoinpoint()
{
AssertUtils.ArgumentNotNull(target, "target");
// if (this.method != null
// if (this.method != null
// && !this.method.DeclaringType.IsAssignableFrom(target.GetType()))
// {
// // This means the target type doesn't implement the interface.
@@ -351,9 +350,9 @@ namespace Spring.Aop.Framework
/// <remarks>
/// <p>
/// <note type="implementnotes">
/// Does <b>not</b> invoke <see cref="System.Object.ToString()"/> on the
/// Does <b>not</b> invoke <see cref="System.Object.ToString()"/> on the
/// <see cref="Spring.Aop.Framework.AbstractMethodInvocation.This"/> target
/// object, as that too may be proxied.
/// object, as that too may be proxied.
/// </note>
/// </p>
/// </remarks>
@@ -377,4 +376,4 @@ namespace Spring.Aop.Framework
return buffer.ToString();
}
}
}
}

5
src/Spring/Spring.Aop/Aop/Framework/Adapter/AfterReturningAdviceAdapter.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,7 +20,6 @@
#region Imports
using System;
using AopAlliance.Aop;
using AopAlliance.Intercept;
@@ -77,4 +76,4 @@ namespace Spring.Aop.Framework.Adapter
return new AfterReturningAdviceInterceptor(advice);
}
}
}
}

5
src/Spring/Spring.Aop/Aop/Framework/Adapter/AfterReturningAdviceInterceptor.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,7 +20,6 @@
#region Imports
using System;
using AopAlliance.Intercept;
using Spring.Util;
@@ -93,4 +92,4 @@ namespace Spring.Aop.Framework.Adapter
return returnValue;
}
}
}
}

5
src/Spring/Spring.Aop/Aop/Framework/Adapter/BeforeAdviceAdapter.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,7 +20,6 @@
#region Imports
using System;
using AopAlliance.Aop;
using AopAlliance.Intercept;
@@ -77,4 +76,4 @@ namespace Spring.Aop.Framework.Adapter
return new MethodBeforeAdviceInterceptor(advice);
}
}
}
}

13
src/Spring/Spring.Aop/Aop/Framework/Adapter/DefaultAdvisorAdapterRegistry.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,9 +20,6 @@
#region Imports
using System;
using System.Collections.Generic;
using AopAlliance.Aop;
using AopAlliance.Intercept;
using Spring.Aop.Support;
@@ -42,7 +39,7 @@ namespace Spring.Aop.Framework.Adapter
public class DefaultAdvisorAdapterRegistry : IAdvisorAdapterRegistry
{
private readonly IList<IAdvisorAdapter> adapters = new List<IAdvisorAdapter>();
/// <summary>
/// Creates a new instance of the
/// <see cref="Spring.Aop.Framework.Adapter.DefaultAdvisorAdapterRegistry"/> class.
@@ -61,7 +58,7 @@ namespace Spring.Aop.Framework.Adapter
RegisterAdvisorAdapter(new AfterReturningAdviceAdapter());
RegisterAdvisorAdapter(new ThrowsAdviceAdapter());
}
/// <summary>
/// Returns an <see cref="Spring.Aop.IAdvisor"/> wrapping the supplied
/// <paramref name="advice"/>.
@@ -71,7 +68,7 @@ namespace Spring.Aop.Framework.Adapter
/// <see cref="Spring.Aop.IBeforeAdvice"/> or
/// <see cref="Spring.Aop.IThrowsAdvice"/>.
/// </param>
/// <returns>
/// <returns>
/// An <see cref="Spring.Aop.IAdvisor"/> wrapping the supplied
/// <paramref name="advice"/>. Never returns <cref lang="null"/>. If
/// the <paramref name="advice"/> parameter is an
@@ -151,4 +148,4 @@ namespace Spring.Aop.Framework.Adapter
this.adapters.Add(adapter);
}
}
}
}

6
src/Spring/Spring.Aop/Aop/Framework/Adapter/GlobalAdvisorAdapterRegistry.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -18,8 +18,6 @@
#endregion
using System;
namespace Spring.Aop.Framework.Adapter
{
/// <summary>
@@ -64,4 +62,4 @@ namespace Spring.Aop.Framework.Adapter
#endregion
}
}
}

5
src/Spring/Spring.Aop/Aop/Framework/Adapter/MethodBeforeAdviceInterceptor.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,7 +20,6 @@
#region Imports
using System;
using AopAlliance.Intercept;
using Spring.Util;
@@ -89,4 +88,4 @@ namespace Spring.Aop.Framework.Adapter
return invocation.Proceed();
}
}
}
}

5
src/Spring/Spring.Aop/Aop/Framework/Adapter/ThrowsAdviceAdapter.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,7 +20,6 @@
#region Imports
using System;
using AopAlliance.Aop;
using AopAlliance.Intercept;
@@ -76,4 +75,4 @@ namespace Spring.Aop.Framework.Adapter
return new ThrowsAdviceInterceptor(advisor.Advice);
}
}
}
}

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

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,7 +20,6 @@
#region Imports
using System;
using System.Collections;
using System.Reflection;
using AopAlliance.Intercept;
@@ -37,7 +36,7 @@ namespace Spring.Aop.Framework.Adapter
/// Implementations of the <see cref="Spring.Aop.IThrowsAdvice"/> interface
/// <b>must</b> define methods of the form...
/// <code lang="C#">
/// AfterThrowing([MethodInfo method, Object[] args, Object target], Exception subclass);
/// AfterThrowing([MethodInfo method, Object[] args, Object target], Exception subclass);
/// </code>
/// The method name is fixed (i.e. your methods <b>must</b> be named
/// <c>AfterThrowing</c>. The first three arguments (<i>as a whole</i>) are
@@ -84,7 +83,7 @@ namespace Spring.Aop.Framework.Adapter
/// </code>
/// <code language="C#">
/// using System.Data;
///
///
/// public class DataExceptionHandlingAdvice
/// {
/// public void AfterThrowing(ConstraintException ex) {
@@ -315,4 +314,4 @@ namespace Spring.Aop.Framework.Adapter
}
}
}
}
}

5
src/Spring/Spring.Aop/Aop/Framework/Adapter/UnknownAdviceTypeException.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,7 +20,6 @@
#region Imports
using System;
using System.Runtime.Serialization;
#endregion
@@ -90,4 +89,4 @@ namespace Spring.Aop.Framework.Adapter
{
}
}
}
}

40
src/Spring/Spring.Aop/Aop/Framework/AdvisedSupport.cs
View File

@@ -18,8 +18,6 @@
#endregion
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Runtime.Serialization;
using System.Text;
@@ -60,19 +58,19 @@ namespace Spring.Aop.Framework
/// <remarks>
/// <p>
/// If an <see cref="AopAlliance.Intercept.IInterceptor"/> is added, it
/// will be wrapped in an advice before being added to this list.
/// will be wrapped in an advice before being added to this list.
/// </p>
/// </remarks>
private List<IAdvisor> _advisors = new List<IAdvisor>();
/// <summary>
/// <summary>
/// Array updated on changes to the advisors list, which is easier to
/// manipulate internally
/// </summary>
private volatile IAdvisor[] _advisorsArray = new IAdvisor[] { };
/// <summary>
/// List of introductions.
/// <summary>
/// List of introductions.
/// </summary>
private List<IIntroductionAdvisor> _introductions = new List<IIntroductionAdvisor>();
@@ -114,7 +112,7 @@ namespace Spring.Aop.Framework
private IAdvisorChainFactory advisorChainFactory;
/// <summary>
/// If no explicit interfaces are specified, interfaces will be automatically determined
/// If no explicit interfaces are specified, interfaces will be automatically determined
/// from the target type
/// </summary>
private bool autoDetectInterfaces;
@@ -137,7 +135,7 @@ namespace Spring.Aop.Framework
/// </summary>
/// <param name="interfaces">The interfaces that are to be proxied.</param>
/// <exception cref="Spring.Aop.Framework.AopConfigException">
/// If this
/// If this
/// </exception>
public AdvisedSupport(Type[] interfaces)
: this()
@@ -513,7 +511,7 @@ namespace Spring.Aop.Framework
AddAdvisor(position, new DefaultPointcutAdvisor(advice));
}
/// <summary>
/// <summary>
/// Return the index (0 based) of the supplied
/// <see cref="Spring.Aop.IAdvisor"/> in the interceptor
/// (advice) chain for this proxy.
@@ -534,7 +532,7 @@ namespace Spring.Aop.Framework
}
}
/// <summary>
/// <summary>
/// Return the index (0 based) of the supplied
/// <see cref="Spring.Aop.IIntroductionAdvisor"/> in the introductions
/// for this proxy.
@@ -775,7 +773,7 @@ namespace Spring.Aop.Framework
}
/// <summary>
/// Adds the advisors from the supplied <paramref name="advisors"/>
/// Adds the advisors from the supplied <paramref name="advisors"/>
/// to the list of <see cref="Spring.Aop.Framework.IAdvised.Advisors"/>.
/// </summary>
/// <param name="advisors">
@@ -905,7 +903,7 @@ namespace Spring.Aop.Framework
}
}
/// <summary>
/// <summary>
/// Replaces the <paramref name="oldAdvisor"/> with the
/// <paramref name="newAdvisor"/>.
/// </summary>
@@ -976,7 +974,7 @@ namespace Spring.Aop.Framework
buffer.Append("targetSource=[" + this.m_targetSource + "];\n");
buffer.Append("advisorChainFactory=" + this.advisorChainFactory + ";\n");
buffer.Append(base.ToString());
return buffer.ToString();
return buffer.ToString();
}
/// <summary>
@@ -990,7 +988,7 @@ namespace Spring.Aop.Framework
}
/// <summary>
/// If no explicit interfaces are specified, interfaces will be automatically determined
/// If no explicit interfaces are specified, interfaces will be automatically determined
/// from the target type on proxy creation. Defaults to true
/// </summary>
public bool AutoDetectInterfaces
@@ -1157,7 +1155,7 @@ namespace Spring.Aop.Framework
return false;
}
/// <summary>
/// <summary>
/// Return the index (0 based) of the supplied
/// <see cref="AopAlliance.Aop.IAdvice"/> in the interceptor
/// (advice) chain for this proxy.
@@ -1185,7 +1183,7 @@ namespace Spring.Aop.Framework
}
}
/// <summary>
/// <summary>
/// Return the index (0 based) of the supplied
/// <see cref="AopAlliance.Aop.IAdvice"/> in the interceptor
/// (advice) chain for this proxy.
@@ -1222,7 +1220,7 @@ namespace Spring.Aop.Framework
return -1;
}
/// <summary>
/// <summary>
/// Return the index (0 based) of the supplied
/// <see cref="Spring.Aop.IAdvisor"/> in the interceptor
/// (advice) chain for this proxy.
@@ -1243,7 +1241,7 @@ namespace Spring.Aop.Framework
return this._advisors != null ? this._advisors.IndexOf(advisor) : -1;
}
/// <summary>
/// <summary>
/// Return the index (0 based) of the supplied
/// <see cref="Spring.Aop.IIntroductionAdvisor"/> in the introductions
/// for this proxy.
@@ -1427,7 +1425,7 @@ namespace Spring.Aop.Framework
}
}
/// <summary>
/// <summary>
/// Creates an AOP proxy using this instance's configuration data.
/// </summary>
/// <remarks>
@@ -1443,7 +1441,7 @@ namespace Spring.Aop.Framework
{
lock (this.SyncRoot)
{
if (this.autoDetectInterfaces && CountNonIntroductionInterfaces() == 0
if (this.autoDetectInterfaces && CountNonIntroductionInterfaces() == 0
// && !this.ProxyTargetType
)
{
@@ -1657,4 +1655,4 @@ namespace Spring.Aop.Framework
return ReflectionUtils.GetInterfaces(target is Type ? (Type)target : target.GetType());
}
}
}
}

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

@@ -20,8 +20,6 @@
#region Imports
using System;
using System.Collections.Generic;
using System.Reflection;
using AopAlliance.Intercept;
@@ -120,4 +118,4 @@ namespace Spring.Aop.Framework
#endregion
}
}
}

5
src/Spring/Spring.Aop/Aop/Framework/AopConfigException.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,7 +20,6 @@
#region Imports
using System;
using System.Runtime.Serialization;
#endregion
@@ -78,4 +77,4 @@ namespace Spring.Aop.Framework
{
}
}
}
}

3
src/Spring/Spring.Aop/Aop/Framework/AopContext.cs
View File

@@ -20,7 +20,6 @@
#region Imports
using System;
using System.Collections;
#endregion
@@ -186,4 +185,4 @@ namespace Spring.Aop.Framework
#endregion
}
}
}

19
src/Spring/Spring.Aop/Aop/Framework/AopUtils.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,7 +20,6 @@
#region Imports
using System;
using System.Reflection;
using Spring.Collections;
@@ -47,7 +46,7 @@ namespace Spring.Aop.Framework
private const string COMPOSITION_PROXY_TYPE_NAME = "CompositionAopProxy";
private const string DECORATOR_PROXY_TYPE_NAME = "DecoratorAopProxy";
private const string INHERITANCE_PROXY_TYPE_NAME = "InheritanceAopProxy";
/// <summary>
@@ -67,7 +66,7 @@ namespace Spring.Aop.Framework
/// Is the supplied <paramref name="instance"/> an AOP proxy?
/// </summary>
/// <remarks>
/// Return whether the given object is either
/// Return whether the given object is either
/// a composition-based proxy or a decorator-based proxy.
/// </remarks>
/// <param name="instance">The instance to be checked.</param>
@@ -185,7 +184,7 @@ namespace Spring.Aop.Framework
}
/// <summary>
/// Gets all of the interfaces that the
/// Gets all of the interfaces that the
/// supplied <see cref="System.Type"/> implements.
/// </summary>
/// <remarks>
@@ -220,7 +219,7 @@ namespace Spring.Aop.Framework
return Type.EmptyTypes;
}
/// <summary>
/// <summary>
/// Can the supplied <paramref name="pointcut"/> apply at all on the
/// supplied <paramref name="targetType"/>?
/// </summary>
@@ -248,7 +247,7 @@ namespace Spring.Aop.Framework
{
return CanApply(pointcut, targetType, proxyInterfaces, false);
}
/// <summary>
/// <summary>
/// Can the supplied <paramref name="pointcut"/> apply at all on the
/// supplied <paramref name="targetType"/>?
/// </summary>
@@ -302,7 +301,7 @@ namespace Spring.Aop.Framework
return false;
}
/// <summary>
/// <summary>
/// Can the supplied <paramref name="advisor"/> apply at all on the
/// supplied <paramref name="targetType"/>?
/// </summary>
@@ -326,7 +325,7 @@ namespace Spring.Aop.Framework
return CanApply(advisor, targetType, proxyInterfaces, false);
}
/// <summary>
/// <summary>
/// Can the supplied <paramref name="advisor"/> apply at all on the
/// supplied <paramref name="targetType"/>?
/// </summary>
@@ -407,4 +406,4 @@ namespace Spring.Aop.Framework
}
}
}
}

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

@@ -18,16 +18,12 @@
#endregion
using System;
using System.Collections.Generic;
using Common.Logging;
using Spring.Core;
using Spring.Objects.Factory;
using Spring.Objects.Factory.Config;
using System.Linq;
namespace Spring.Aop.Framework.AutoProxy
{
/// <summary>
@@ -57,7 +53,7 @@ namespace Spring.Aop.Framework.AutoProxy
private IAdvisorRetrievalHelper _advisorRetrievalHelper;
/// <summary>
/// Initialize
/// Initialize
/// </summary>
protected AbstractAdvisorAutoProxyCreator()
{
@@ -143,7 +139,7 @@ namespace Spring.Aop.Framework.AutoProxy
/// <param name="targetType">the type of the object to be advised</param>
/// <param name="targetName">the name of the object to be advised</param>
/// <returns>
/// the empty list, not null, if there are no pointcuts or interceptors.
/// the empty list, not null, if there are no pointcuts or interceptors.
/// The by-order sorted list of advisors otherwise
/// </returns>
protected IList<IAdvisor> FindEligibleAdvisors(Type targetType, string targetName)
@@ -169,7 +165,7 @@ namespace Spring.Aop.Framework.AutoProxy
}
/// <summary>
/// From the given list of candidate advisors, select the ones that are applicable
/// From the given list of candidate advisors, select the ones that are applicable
/// to the given target specified by targetType and name.
/// </summary>
/// <param name="candidateAdvisors">the list of candidate advisors to date</param>
@@ -275,4 +271,4 @@ namespace Spring.Aop.Framework.AutoProxy
}
}
}
}
}

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

@@ -14,12 +14,8 @@
* limitations under the License.
*/
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Runtime.Remoting;
using AopAlliance.Aop;
@@ -227,7 +223,7 @@ namespace Spring.Aop.Framework.AutoProxy
#if NETSTANDARD
var isTransparentProxy = false;
#else
var isTransparentProxy = RemotingServices.IsTransparentProxy(obj);
var isTransparentProxy = System.Runtime.Remoting.RemotingServices.IsTransparentProxy(obj);
#endif
Type objectType = isTransparentProxy
@@ -640,4 +636,4 @@ namespace Spring.Aop.Framework.AutoProxy
return pvs;
}
}
}
}

11
src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractFilteringAutoProxyCreator.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,15 +20,12 @@
#region Imports
using System;
using System.Collections.Generic;
#endregion
namespace Spring.Aop.Framework.AutoProxy
{
/// <summary>
/// The base class for AutoProxyCreator implementations that mark objects
/// The base class for AutoProxyCreator implementations that mark objects
/// eligible for proxying based on arbitrary criteria.
/// </summary>
/// <author>Erich Eichinger</author>
@@ -72,8 +69,8 @@ namespace Spring.Aop.Framework.AutoProxy
/// </remarks>
/// <param name="targetType">the object's type</param>
/// <param name="targetName">the name of the object</param>
/// <seealso cref="AbstractAutoProxyCreator.ShouldSkip"/>
/// <seealso cref="AbstractAutoProxyCreator.ShouldSkip"/>
/// <returns>whether the given object shall be proxied.</returns>
protected abstract bool IsEligibleForProxying( Type targetType, string targetName );
}
}
}

6
src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AttributeAutoProxyCreator.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,8 +20,6 @@
#region Imports
using System;
using Spring.Util;
#endregion
@@ -111,4 +109,4 @@ namespace Spring.Aop.Framework.AutoProxy
}
}
}
}
}

4
src/Spring/Spring.Aop/Aop/Framework/AutoProxy/DefaultAdvisorAutoProxyCreator.cs
View File

@@ -20,8 +20,6 @@
#region Imports
using System;
using System.Collections.Generic;
using Spring.Objects.Factory;
#endregion
@@ -138,4 +136,4 @@ namespace Spring.Aop.Framework.AutoProxy
cachedAdvisors = base.FindCandidateAdvisors(null, null);
}
}
}
}

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

@@ -1,11 +1,8 @@
using System;
using System.Collections.Generic;
namespace Spring.Aop.Framework.AutoProxy
{
/// <summary>
/// Interface encapsulating the advisor retrieval strategy used by
/// an <see cref="AbstractAdvisorAutoProxyCreator"/> to retrieve the
/// Interface encapsulating the advisor retrieval strategy used by
/// an <see cref="AbstractAdvisorAutoProxyCreator"/> to retrieve the
/// applicable list of advisor objects.
/// </summary>
public interface IAdvisorRetrievalHelper
@@ -15,4 +12,4 @@ namespace Spring.Aop.Framework.AutoProxy
/// </summary>
List<IAdvisor> FindAdvisorObjects(Type targetType, string targetName);
}
}
}

5
src/Spring/Spring.Aop/Aop/Framework/AutoProxy/ITargetSourceCreator.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,7 +20,6 @@
#region Imports
using System;
using Spring.Objects.Factory;
#endregion
@@ -49,4 +48,4 @@ namespace Spring.Aop.Framework.AutoProxy
/// interested in the particular object</returns>
ITargetSource GetTargetSource(Type objectType, string objectName, IObjectFactory factory);
}
}
}

33
src/Spring/Spring.Aop/Aop/Framework/AutoProxy/InfrastructureAdvisorAutoProxyCreator.cs
View File

@@ -1,24 +1,23 @@
#region License
/*
* Copyright 2002-2010 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
/*
* Copyright 2002-2010 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#endregion
using System;
using Spring.Objects.Factory.Config;
namespace Spring.Aop.Framework.AutoProxy
@@ -40,7 +39,7 @@ namespace Spring.Aop.Framework.AutoProxy
{
return new InfrastructurAdvisorRetrievalHelper(this, objectFactory);
}
private class InfrastructurAdvisorRetrievalHelper : ObjectFactoryAdvisorRetrievalHelper
{
private readonly InfrastructureAdvisorAutoProxyCreator _owner;
@@ -58,4 +57,4 @@ namespace Spring.Aop.Framework.AutoProxy
}
}
}
}
}

26
src/Spring/Spring.Aop/Aop/Framework/AutoProxy/InheritanceBasedAopConfigurer.cs
View File

@@ -14,9 +14,7 @@
* limitations under the License.
*/
using System;
using System.Collections;
using System.Collections.Generic;
using System.Runtime.Serialization;
using AopAlliance.Aop;
@@ -32,8 +30,8 @@ using Spring.Core;
namespace Spring.Aop.Framework.AutoProxy
{
/// <summary>
/// <see cref="IObjectFactoryPostProcessor"/> implementation that replaces a group of objects
/// with a 'true' inheritance based AOP mechanism that delegates
/// <see cref="IObjectFactoryPostProcessor"/> implementation that replaces a group of objects
/// with a 'true' inheritance based AOP mechanism that delegates
/// to the given interceptors before invoking the object itself.
/// </summary>
/// <author>Bruno Baia</author>
@@ -50,7 +48,7 @@ namespace Spring.Aop.Framework.AutoProxy
private IAdvisorAdapterRegistry advisorAdapterRegistry = GlobalAdvisorAdapterRegistry.Instance;
/// <summary>
/// Set the names of the objects in IList fashioned way
/// Set the names of the objects in IList fashioned way
/// that should automatically get intercepted.
/// </summary>
/// <remarks>
@@ -62,19 +60,19 @@ namespace Spring.Aop.Framework.AutoProxy
set { objectNames = value; }
}
/// <summary>
/// Sets the common interceptors, a list of <see cref="AopAlliance.Aop.IAdvice"/>,
/// <summary>
/// Sets the common interceptors, a list of <see cref="AopAlliance.Aop.IAdvice"/>,
/// <see cref="Spring.Aop.IAdvisor"/> and introduction object names.
/// </summary>
/// <remarks>
/// <para>
/// If this property isn't set, there will be zero common interceptors.
/// If this property isn't set, there will be zero common interceptors.
/// This is perfectly valid, if "specific" interceptors such as
/// matching Advisors are all we want.
/// </para>
/// </remarks>
/// <value>
/// The list of <see cref="AopAlliance.Aop.IAdvice"/>,
/// The list of <see cref="AopAlliance.Aop.IAdvice"/>,
/// <see cref="Spring.Aop.IAdvisor"/> and introduction object names.
/// </value>
/// <seealso cref="AopAlliance.Aop.IAdvice"/>
@@ -85,7 +83,7 @@ namespace Spring.Aop.Framework.AutoProxy
}
/// <summary>
/// Is target type attributes, method attributes, method's return type attributes
/// Is target type attributes, method attributes, method's return type attributes
/// and method's parameter attributes to be proxied in addition
/// to any interfaces declared on the proxied <see cref="System.Type"/>?
/// </summary>
@@ -99,7 +97,7 @@ namespace Spring.Aop.Framework.AutoProxy
/// Gets or sets a value indicating whether inherited members should be proxied.
/// </summary>
/// <value>
/// <see langword="true"/> if inherited members should be proxied;
/// <see langword="true"/> if inherited members should be proxied;
/// otherwise, <see langword="false"/>.
/// </value>
public bool ProxyDeclaredMembersOnly
@@ -112,7 +110,7 @@ namespace Spring.Aop.Framework.AutoProxy
/// Gets or sets a value indicating whether interfaces members should be proxied.
/// </summary>
/// <value>
/// <see langword="true"/> if interfaces members should be proxied;
/// <see langword="true"/> if interfaces members should be proxied;
/// otherwise, <see langword="false"/>.
/// </value>
public bool ProxyInterfaces
@@ -301,14 +299,14 @@ namespace Spring.Aop.Framework.AutoProxy
_targetType = targetType;
}
/// <inheritdoc />
private InheritanceBasedAopTargetSource(SerializationInfo info, StreamingContext context)
{
var type = info.GetString("TargetType");
_targetType = type != null ? Type.GetType(type) : null;
}
/// <inheritdoc />
public void GetObjectData(SerializationInfo info, StreamingContext context)
{

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

@@ -18,9 +18,6 @@
#endregion
using System;
using System.Collections.Generic;
using Common.Logging;
using Spring.Objects.Factory;
using Spring.Objects.Factory.Config;
@@ -73,7 +70,7 @@ namespace Spring.Aop.Framework.AutoProxy
{
return advisors;
}
for (int i = 0; i < advisorNames.Count; i++)
{
string name = advisorNames[i];
@@ -118,7 +115,7 @@ namespace Spring.Aop.Framework.AutoProxy
if (advisorCandidate is IAdvisor)
{
advisors.Add((IAdvisor) advisorCandidate);
}
}
else if (advisorCandidate is IAdvisors)
{
advisors.AddRange(((IAdvisors)advisorCandidate).Advisors);
@@ -158,7 +155,7 @@ namespace Spring.Aop.Framework.AutoProxy
/// <summary>
/// Determine, whether the specified aspect object is eligible.
/// The default implementation accepts all except for advisors that are
/// The default implementation accepts all except for advisors that are
/// part of the internal infrastructure.
/// </summary>
/// <param name="advisorName">the name of the candidate advisor</param>
@@ -174,4 +171,4 @@ namespace Spring.Aop.Framework.AutoProxy
return this.ObjectFactory.ContainsObject(advisorName);
}
}
}
}

15
src/Spring/Spring.Aop/Aop/Framework/AutoProxy/ObjectNameAutoProxyCreator.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -18,7 +18,6 @@
#endregion
using System;
using System.Collections;
using Spring.Objects.Factory;
using Spring.Util;
@@ -35,7 +34,7 @@ namespace Spring.Aop.Framework.AutoProxy
/// </para>
/// <para>In case of a IFactoryObject, only the objects created by the
/// FactoryBean will get proxied. If you intend to proxy a IFactoryObject instance itself
/// specify the object name of the IFactoryObject including
/// specify the object name of the IFactoryObject including
/// the factory-object prefix "&amp;" e.g. "&amp;MyFactoryObject".
/// </para>
/// </remarks>
@@ -54,7 +53,7 @@ namespace Spring.Aop.Framework.AutoProxy
{}
/// <summary>
/// Set the names of the objects in IList fashioned way that should automatically
/// Set the names of the objects in IList fashioned way that should automatically
/// get wrapped with proxies.
/// A name can specify a prefix to match by ending with "*", e.g. "myObject,tx*"
/// will match the object named "myObject" and all objects whose name start with "tx".
@@ -76,7 +75,7 @@ namespace Spring.Aop.Framework.AutoProxy
/// Identify as object to proxy if the object name is in the configured list of names.
/// </summary>
protected override bool IsEligibleForProxying( Type targetType, string targetName )
{
{
bool shallProxy = IsObjectNameMatch(targetType, targetName, this.ObjectNames);
return shallProxy;
}
@@ -103,10 +102,10 @@ namespace Spring.Aop.Framework.AutoProxy
/// </summary>
/// <param name="objType">the object's type. Must not be <c>null</c>.</param>
/// <param name="objectName">the name of the object Must not be <c>null</c>.</param>
/// <param name="objectNamePatterns">the list of patterns, that <paramref name="objectName"/> shall be matched against. Must not be <c>null</c>.</param>
/// <param name="objectNamePatterns">the list of patterns, that <paramref name="objectName"/> shall be matched against. Must not be <c>null</c>.</param>
/// <returns>
/// If <paramref name="objectNamePatterns"/> is <c>null</c>, will always return <c>true</c>, otherwise
/// if <paramref name="objectName"/> matches any of the patterns specified in <paramref name="objectNamePatterns"/>.
/// if <paramref name="objectName"/> matches any of the patterns specified in <paramref name="objectNamePatterns"/>.
/// </returns>
protected bool IsObjectNameMatch(Type objType, string objectName, IList objectNamePatterns)
{
@@ -133,4 +132,4 @@ namespace Spring.Aop.Framework.AutoProxy
return false;
}
}
}
}

6
src/Spring/Spring.Aop/Aop/Framework/AutoProxy/PointcutFilteringAutoProxyCreator.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,8 +20,6 @@
#region Imports
using System;
using Spring.Util;
#endregion
@@ -56,4 +54,4 @@ namespace Spring.Aop.Framework.AutoProxy
return shallProxy;
}
}
}
}

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

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,7 +20,6 @@
#region Imports
using System;
using Common.Logging;
using Spring.Aop.Target;
using Spring.Objects.Factory;
@@ -104,4 +103,4 @@ namespace Spring.Aop.Framework.AutoProxy.Target
IObjectFactory factory);
}
}
}

7
src/Spring/Spring.Aop/Aop/Framework/AutoProxy/TypeNameAutoProxyCreator.cs
View File

@@ -20,7 +20,6 @@
#region Imports
using System;
using Spring.Aop.Support;
using Spring.Util;
@@ -41,7 +40,7 @@ namespace Spring.Aop.Framework.AutoProxy
///</summary>
public string[] TypeNames
{
get
get
{
if (_typeNameFilter != null)
{
@@ -64,7 +63,7 @@ namespace Spring.Aop.Framework.AutoProxy
/// </remarks>
/// <param name="targetType">the object's type</param>
/// <param name="targetName">the name of the object</param>
/// <seealso cref="AbstractAutoProxyCreator.ShouldSkip"/>
/// <seealso cref="AbstractAutoProxyCreator.ShouldSkip"/>
/// <returns>whether the given object shall be proxied.</returns>
protected override bool IsEligibleForProxying(Type targetType, string targetName)
{
@@ -74,4 +73,4 @@ namespace Spring.Aop.Framework.AutoProxy
return shallProxy;
}
}
}
}

9
src/Spring/Spring.Aop/Aop/Framework/DynamicMethodInvocation.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,7 +20,6 @@
#region Imports
using System;
using System.Collections;
using System.Reflection;
@@ -116,8 +115,8 @@ namespace Spring.Aop.Framework
}
/// <summary>
/// Creates a new <see cref="Spring.Aop.Framework.DynamicMethodInvocation"/> instance
/// from the specified <see cref="AopAlliance.Intercept.IMethodInvocation"/> and
/// Creates a new <see cref="Spring.Aop.Framework.DynamicMethodInvocation"/> instance
/// from the specified <see cref="AopAlliance.Intercept.IMethodInvocation"/> and
/// increments the interceptor index.
/// </summary>
/// <param name="invocation">
@@ -134,4 +133,4 @@ namespace Spring.Aop.Framework
return rmi;
}
}
}
}

5
src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/AbstractAopProxyFactory.cs
View File

@@ -1,6 +1,3 @@
using System;
using System.Collections.Generic;
using Spring.Aop.Support;
using Spring.Aop.Target;
@@ -88,4 +85,4 @@ namespace Spring.Aop.Framework.DynamicProxy
return AopUtils.IsAopProxyType(targetSource.TargetType);
}
}
}
}

40
src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/AbstractAopProxyMethodBuilder.cs
View File

@@ -18,8 +18,6 @@
#endregion
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Reflection.Emit;
using System.Runtime.Serialization;
@@ -41,13 +39,13 @@ namespace Spring.Aop.Framework.DynamicProxy
protected IAopProxyTypeGenerator aopProxyGenerator;
/// <summary>
/// The dictionary to cache the list of target
/// The dictionary to cache the list of target
/// <see cref="System.Reflection.MethodInfo"/>s.
/// </summary>
protected IDictionary<string, MethodInfo> targetMethods;
/// <summary>
/// The dictionary to cache the list of target
/// The dictionary to cache the list of target
/// <see cref="System.Reflection.MethodInfo"/>s defined on the proxy.
/// </summary>
protected IDictionary<string, MethodInfo> onProxyTargetMethods;
@@ -75,13 +73,13 @@ namespace Spring.Aop.Framework.DynamicProxy
protected LocalBuilder returnValue;
/// <summary>
/// The local variable to store the closed generic method
/// The local variable to store the closed generic method
/// when the target method is generic.
/// </summary>
protected LocalBuilder genericTargetMethod;
/// <summary>
/// The local variable to store the closed generic method
/// The local variable to store the closed generic method
/// when the target method defined on the proxy is generic.
/// </summary>
protected LocalBuilder genericOnProxyTargetMethod;
@@ -92,11 +90,11 @@ namespace Spring.Aop.Framework.DynamicProxy
protected FieldBuilder targetMethodCacheField;
/// <summary>
/// The field to cache the target <see cref="System.Reflection.MethodInfo"/>
/// The field to cache the target <see cref="System.Reflection.MethodInfo"/>
/// defined on the proxy.
/// </summary>
protected FieldBuilder onProxyTargetMethodCacheField;
// convinience fields
/// <summary>
@@ -137,7 +135,7 @@ namespace Spring.Aop.Framework.DynamicProxy
/// implemented explicitly; otherwise <see langword="false"/>.
/// </param>
/// <param name="targetMethods">
/// The dictionary to cache the list of target
/// The dictionary to cache the list of target
/// <see cref="System.Reflection.MethodInfo"/>s.
/// </param>
protected AbstractAopProxyMethodBuilder(
@@ -159,11 +157,11 @@ namespace Spring.Aop.Framework.DynamicProxy
/// implemented explicitly; otherwise <see langword="false"/>.
/// </param>
/// <param name="targetMethods">
/// The dictionary to cache the list of target
/// The dictionary to cache the list of target
/// <see cref="System.Reflection.MethodInfo"/>s.
/// </param>
/// <param name="onProxyTargetMethods">
/// The dictionary to cache the list of target
/// The dictionary to cache the list of target
/// <see cref="System.Reflection.MethodInfo"/>s defined on the proxy.
/// </param>
protected AbstractAopProxyMethodBuilder(
@@ -220,7 +218,7 @@ namespace Spring.Aop.Framework.DynamicProxy
string methodId = GenerateMethodCacheFieldId(method);
targetMethods.Add(methodId, method);
targetMethodCacheField = typeBuilder.DefineField(methodId, typeof(MethodInfo),
targetMethodCacheField = typeBuilder.DefineField(methodId, typeof(MethodInfo),
FieldAttributes.Private | FieldAttributes.Static);
MakeGenericMethod(il, method, targetMethodCacheField, genericTargetMethod);
@@ -237,7 +235,7 @@ namespace Spring.Aop.Framework.DynamicProxy
}
/// <summary>
/// Create a closed generic method for the current call
/// Create a closed generic method for the current call
/// if target method is a generic definition.
/// </summary>
/// <param name="il">The IL generator to use.</param>
@@ -283,7 +281,7 @@ namespace Spring.Aop.Framework.DynamicProxy
}
/// <summary>
/// Generates the IL instructions that pushes
/// Generates the IL instructions that pushes
/// the target type on stack.
/// </summary>
/// <param name="il">The IL generator to use.</param>
@@ -294,8 +292,8 @@ namespace Spring.Aop.Framework.DynamicProxy
}
/// <summary>
/// Generates the IL instructions that pushes
/// the current <see cref="Spring.Aop.Framework.DynamicProxy.AdvisedProxy"/>
/// Generates the IL instructions that pushes
/// the current <see cref="Spring.Aop.Framework.DynamicProxy.AdvisedProxy"/>
/// instance on stack.
/// </summary>
/// <param name="il">The IL generator to use.</param>
@@ -351,7 +349,7 @@ namespace Spring.Aop.Framework.DynamicProxy
interceptors = il.DeclareLocal(typeof(System.Collections.IList));
targetType = il.DeclareLocal(typeof(Type));
arguments = il.DeclareLocal(typeof(Object[]));
if (method.IsGenericMethodDefinition)
{
genericTargetMethod = il.DeclareLocal(typeof(MethodInfo));
@@ -592,7 +590,7 @@ namespace Spring.Aop.Framework.DynamicProxy
}
/// <summary>
/// Emits MSIL instructions to load a value of the specified <paramref name="type"/>
/// Emits MSIL instructions to load a value of the specified <paramref name="type"/>
/// onto the evaluation stack indirectly.
/// </summary>
/// <param name="il">The IL generator to use.</param>
@@ -619,7 +617,7 @@ namespace Spring.Aop.Framework.DynamicProxy
}
/// <summary>
/// Emit MSIL instructions to store a value of the specified <paramref name="type"/>
/// Emit MSIL instructions to store a value of the specified <paramref name="type"/>
/// at a supplied address.
/// </summary>
/// <param name="il">The IL generator to use.</param>
@@ -645,7 +643,7 @@ namespace Spring.Aop.Framework.DynamicProxy
}
/// <summary>
/// Emits MSIL instructions to convert the boxed representation
/// Emits MSIL instructions to convert the boxed representation
/// of the supplied <paramref name="type"/> to its unboxed form.
/// </summary>
/// <param name="il">The IL generator to use.</param>
@@ -715,7 +713,7 @@ namespace Spring.Aop.Framework.DynamicProxy
public static readonly MethodInfo GetTypeMethod =
typeof(Object).GetMethod("GetType", Type.EmptyTypes);
public static readonly MethodInfo GetTypeFromHandle =
public static readonly MethodInfo GetTypeFromHandle =
typeof(Type).GetMethod("GetTypeFromHandle", new Type[] { typeof(RuntimeTypeHandle) });
public static readonly MethodInfo MakeGenericMethod =

17
src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/AbstractAopProxyTypeBuilder.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,7 +20,6 @@
#region Imports
using System;
using System.Collections;
using System.Reflection.Emit;
@@ -32,17 +31,17 @@ using Spring.Proxy;
namespace Spring.Aop.Framework.DynamicProxy
{
/// <summary>
/// Base class for proxy builders that can be used
/// Base class for proxy builders that can be used
/// to create an AOP proxy for any object.
/// </summary>
/// <author>Bruno Baia</author>
public abstract class AbstractAopProxyTypeBuilder :
public abstract class AbstractAopProxyTypeBuilder :
AbstractProxyTypeBuilder, IAopProxyTypeGenerator
{
#region IProxyTypeGenerator Members
/// <summary>
/// Generates the IL instructions that pushes
/// Generates the IL instructions that pushes
/// the target instance on which calls should be delegated to.
/// </summary>
/// <param name="il">The IL generator to use.</param>
@@ -58,8 +57,8 @@ namespace Spring.Aop.Framework.DynamicProxy
#region IAopProxyTypeGenerator Members
/// <summary>
/// Generates the IL instructions that pushes
/// the current <see cref="Spring.Aop.Framework.DynamicProxy.AdvisedProxy"/>
/// Generates the IL instructions that pushes
/// the current <see cref="Spring.Aop.Framework.DynamicProxy.AdvisedProxy"/>
/// instance on stack.
/// </summary>
/// <param name="il">The IL generator to use.</param>
@@ -88,8 +87,8 @@ namespace Spring.Aop.Framework.DynamicProxy
return attrs;
}
#endregion
}
}
}

6
src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/AdvisedProxy.cs
View File

@@ -14,9 +14,7 @@
* limitations under the License.
*/
using System;
using System.Collections;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Collections.Specialized;
using System.Reflection;
@@ -56,7 +54,7 @@ namespace Spring.Aop.Framework.DynamicProxy
public IAdvice[] m_introductions;
/// <summary>
/// Target source
/// Target source
/// </summary>
public ITargetSource m_targetSource;
@@ -390,4 +388,4 @@ namespace Spring.Aop.Framework.DynamicProxy
get { return m_targetType; }
}
}
}
}

9
src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/BaseAopProxyMethodBuilder.cs
View File

@@ -18,7 +18,6 @@
#endregion
using System.Collections.Generic;
using System.Reflection;
using System.Reflection.Emit;
@@ -27,7 +26,7 @@ using Spring.Util;
namespace Spring.Aop.Framework.DynamicProxy
{
/// <summary>
/// <see cref="Spring.Proxy.IProxyMethodBuilder"/> implementation
/// <see cref="Spring.Proxy.IProxyMethodBuilder"/> implementation
/// that delegates method calls to the base method.
/// </summary>
/// <author>Bruno Baia</author>
@@ -41,15 +40,15 @@ namespace Spring.Aop.Framework.DynamicProxy
/// The <see cref="IAopProxyTypeGenerator"/> implementation to use.
/// </param>
/// <param name="targetMethods">
/// The dictionary to cache the list of target
/// The dictionary to cache the list of target
/// <see cref="System.Reflection.MethodInfo"/>s.
/// </param>
/// <param name="onProxyTargetMethods">
/// The dictionary to cache the list of target
/// The dictionary to cache the list of target
/// <see cref="System.Reflection.MethodInfo"/>s defined on the proxy.
/// </param>
public BaseAopProxyMethodBuilder(
TypeBuilder typeBuilder, IAopProxyTypeGenerator aopProxyGenerator,
TypeBuilder typeBuilder, IAopProxyTypeGenerator aopProxyGenerator,
IDictionary<string, MethodInfo> targetMethods, IDictionary<string, MethodInfo> onProxyTargetMethods)
: base(typeBuilder, aopProxyGenerator, false, targetMethods, onProxyTargetMethods)
{

3
src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/BaseCompositionAopProxy.cs
View File

@@ -20,7 +20,6 @@
#region Imports
using System;
using System.Runtime.Serialization;
#endregion
@@ -163,4 +162,4 @@ namespace Spring.Aop.Framework.DynamicProxy
#endregion
}
}
}

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

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,8 +20,6 @@
#region Imports
using System;
using System.Collections.Generic;
using System.Text;
using System.Collections;
@@ -33,7 +31,7 @@ using Spring.Proxy;
namespace Spring.Aop.Framework.DynamicProxy
{
/// <summary>
/// Implementation of the <see cref="Spring.Aop.Framework.IAopProxyFactory"/>
/// Implementation of the <see cref="Spring.Aop.Framework.IAopProxyFactory"/>
/// interface that caches the AOP proxy <see cref="System.Type"/> instance.
/// </summary>
/// <remarks>
@@ -210,4 +208,4 @@ namespace Spring.Aop.Framework.DynamicProxy
#endregion
}
}
}

18
src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/CompositionAopProxyTypeBuilder.cs
View File

@@ -18,8 +18,6 @@
#endregion
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Reflection.Emit;
using System.Runtime.Serialization;
@@ -40,14 +38,14 @@ namespace Spring.Aop.Framework.DynamicProxy
private readonly IAdvised advised;
/// <summary>
/// Creates a new instance of the
/// Creates a new instance of the
/// <see cref="CompositionAopProxyTypeBuilder"/> class.
/// </summary>
/// <param name="advised">The proxy configuration.</param>
public CompositionAopProxyTypeBuilder(IAdvised advised)
{
this.advised = advised;
Name = PROXY_TYPE_NAME;
BaseType = typeof(BaseCompositionAopProxy);
TargetType = advised.TargetSource.TargetType.IsInterface ? typeof(object) : advised.TargetSource.TargetType;
@@ -86,8 +84,8 @@ namespace Spring.Aop.Framework.DynamicProxy
if (target is null)
{
// implement interface
ImplementInterface(typeBuilder,
new TargetAopProxyMethodBuilder(typeBuilder, this, false, targetMethods),
ImplementInterface(typeBuilder,
new TargetAopProxyMethodBuilder(typeBuilder, this, false, targetMethods),
intf, TargetType);
}
else if (target is IIntroductionAdvisor)
@@ -112,8 +110,8 @@ namespace Spring.Aop.Framework.DynamicProxy
}
/// <summary>
/// Generates the IL instructions that pushes
/// the current <see cref="Spring.Aop.Framework.DynamicProxy.AdvisedProxy"/>
/// Generates the IL instructions that pushes
/// the current <see cref="Spring.Aop.Framework.DynamicProxy.AdvisedProxy"/>
/// instance on stack.
/// </summary>
/// <param name="il">The IL generator to use.</param>
@@ -167,7 +165,7 @@ namespace Spring.Aop.Framework.DynamicProxy
}
/// <summary>
/// Determines if the specified <paramref name="type"/>
/// Determines if the specified <paramref name="type"/>
/// is one of those generated by this builder.
/// </summary>
/// <param name="type">The type to check.</param>
@@ -180,4 +178,4 @@ namespace Spring.Aop.Framework.DynamicProxy
return type.FullName.StartsWith(PROXY_TYPE_NAME);
}
}
}
}

20
src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/DecoratorAopProxyTypeBuilder.cs
View File

@@ -18,8 +18,6 @@
#endregion
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Reflection.Emit;
using System.Runtime.Serialization;
@@ -45,7 +43,7 @@ namespace Spring.Aop.Framework.DynamicProxy
protected FieldBuilder advisedProxyField;
/// <summary>
/// Creates a new instance of the
/// Creates a new instance of the
/// <see cref="DecoratorAopProxyTypeBuilder"/> class.
/// </summary>
/// <param name="advised">The proxy configuration.</param>
@@ -122,8 +120,8 @@ namespace Spring.Aop.Framework.DynamicProxy
}
// inherit from target type
InheritType(typeBuilder,
new TargetAopProxyMethodBuilder(typeBuilder, this, false, targetMethods),
InheritType(typeBuilder,
new TargetAopProxyMethodBuilder(typeBuilder, this, false, targetMethods),
TargetType);
// implement IAdvised interface
@@ -147,8 +145,8 @@ namespace Spring.Aop.Framework.DynamicProxy
}
/// <summary>
/// Generates the IL instructions that pushes
/// the current <see cref="Spring.Aop.Framework.DynamicProxy.AdvisedProxy"/>
/// Generates the IL instructions that pushes
/// the current <see cref="Spring.Aop.Framework.DynamicProxy.AdvisedProxy"/>
/// instance on stack.
/// </summary>
/// <param name="il">The IL generator to use.</param>
@@ -180,7 +178,7 @@ namespace Spring.Aop.Framework.DynamicProxy
MethodBuilder mb =
typeBuilder.DefineMethod("GetObjectData",
MethodAttributes.Public | MethodAttributes.HideBySig |
MethodAttributes.Public | MethodAttributes.HideBySig |
MethodAttributes.NewSlot | MethodAttributes.Virtual,
typeof (void),
new Type[] {typeof (SerializationInfo), typeof (StreamingContext)});
@@ -225,7 +223,7 @@ namespace Spring.Aop.Framework.DynamicProxy
/// </summary>
/// <remarks>
/// <p>
/// This implementation creates a new instance
/// This implementation creates a new instance
/// of the <see cref="Spring.Aop.Framework.DynamicProxy.AdvisedProxy"/> class.
/// </p>
/// </remarks>
@@ -271,7 +269,7 @@ namespace Spring.Aop.Framework.DynamicProxy
}
/// <summary>
/// Determines if the specified <paramref name="type"/>
/// Determines if the specified <paramref name="type"/>
/// is one of those generated by this builder.
/// </summary>
/// <param name="type">The type to check.</param>
@@ -284,4 +282,4 @@ namespace Spring.Aop.Framework.DynamicProxy
return type.FullName.StartsWith(PROXY_TYPE_NAME);
}
}
}
}

5
src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/DefaultAopProxyFactory.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -18,7 +18,6 @@
#endregion
using System;
using System.Reflection;
using Spring.Proxy;
using Spring.Util;
@@ -95,4 +94,4 @@ namespace Spring.Aop.Framework.DynamicProxy
return typeBuilder.BuildProxyType();
}
}
}
}

18
src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/InheritanceAopProxyTypeBuilder.cs
View File

@@ -18,8 +18,6 @@
#endregion
using System;
using System.Collections.Generic;
using System.Runtime.Serialization;
using System.Reflection;
using System.Reflection.Emit;
@@ -49,7 +47,7 @@ namespace Spring.Aop.Framework.DynamicProxy
/// Gets or sets a value indicating whether inherited members should be proxied.
/// </summary>
/// <value>
/// <see langword="true"/> if inherited members should be proxied;
/// <see langword="true"/> if inherited members should be proxied;
/// otherwise, <see langword="false"/>.
/// </value>
public bool ProxyDeclaredMembersOnly
@@ -59,7 +57,7 @@ namespace Spring.Aop.Framework.DynamicProxy
}
/// <summary>
/// Creates a new instance of the
/// Creates a new instance of the
/// <see cref="CompositionAopProxyTypeBuilder"/> class.
/// </summary>
/// <param name="advised">The proxy configuration.</param>
@@ -78,7 +76,7 @@ namespace Spring.Aop.Framework.DynamicProxy
advised.TargetSource.TargetType.FullName));
}
this.advised = advised;
Name = PROXY_TYPE_NAME;
TargetType = advised.TargetSource.TargetType;
BaseType = TargetType;
@@ -171,7 +169,7 @@ namespace Spring.Aop.Framework.DynamicProxy
}
/// <summary>
/// Generates the IL instructions that pushes
/// Generates the IL instructions that pushes
/// the target instance on which calls should be delegated to.
/// </summary>
/// <param name="il">The IL generator to use.</param>
@@ -181,8 +179,8 @@ namespace Spring.Aop.Framework.DynamicProxy
}
/// <summary>
/// Generates the IL instructions that pushes
/// the current <see cref="Spring.Aop.Framework.DynamicProxy.AdvisedProxy"/>
/// Generates the IL instructions that pushes
/// the current <see cref="Spring.Aop.Framework.DynamicProxy.AdvisedProxy"/>
/// instance on stack.
/// </summary>
/// <param name="il">The IL generator to use.</param>
@@ -321,7 +319,7 @@ namespace Spring.Aop.Framework.DynamicProxy
}
/// <summary>
/// Determines if the specified <paramref name="type"/>
/// Determines if the specified <paramref name="type"/>
/// is one of those generated by this builder.
/// </summary>
/// <param name="type">The type to check.</param>
@@ -334,4 +332,4 @@ namespace Spring.Aop.Framework.DynamicProxy
return type.FullName.StartsWith(PROXY_TYPE_NAME);
}
}
}
}

9
src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/IntroductionProxyMethodBuilder.cs
View File

@@ -18,14 +18,13 @@
#endregion
using System.Collections.Generic;
using System.Reflection;
using System.Reflection.Emit;
namespace Spring.Aop.Framework.DynamicProxy
{
/// <summary>
/// <see cref="Spring.Proxy.IProxyMethodBuilder"/> implementation
/// <see cref="Spring.Proxy.IProxyMethodBuilder"/> implementation
/// that delegates method calls to introduction object.
/// </summary>
/// <author>Aleksandar Seovic</author>
@@ -45,7 +44,7 @@ namespace Spring.Aop.Framework.DynamicProxy
/// The <see cref="IAopProxyTypeGenerator"/> implementation to use.
/// </param>
/// <param name="targetMethods">
///
///
/// </param>
/// <param name="index">index of the introduction to delegate call to</param>
public IntroductionProxyMethodBuilder(
@@ -57,7 +56,7 @@ namespace Spring.Aop.Framework.DynamicProxy
}
/// <summary>
/// Generates the IL instructions that pushes
/// Generates the IL instructions that pushes
/// the introduction type on stack.
/// </summary>
/// <param name="il">The IL generator to use.</param>
@@ -68,7 +67,7 @@ namespace Spring.Aop.Framework.DynamicProxy
}
/// <summary>
/// Generates the IL instructions that pushes
/// Generates the IL instructions that pushes
/// the introduction instance on stack.
/// </summary>
/// <param name="il">The IL generator to use.</param>

9
src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/TargetAopProxyMethodBuilder.cs
View File

@@ -18,14 +18,13 @@
#endregion
using System.Collections.Generic;
using System.Reflection;
using System.Reflection.Emit;
namespace Spring.Aop.Framework.DynamicProxy
{
/// <summary>
/// <see cref="Spring.Proxy.IProxyMethodBuilder"/> implementation
/// <see cref="Spring.Proxy.IProxyMethodBuilder"/> implementation
/// that delegates method calls to target object.
/// </summary>
/// <author>Aleksandar Seovic</author>
@@ -49,10 +48,10 @@ namespace Spring.Aop.Framework.DynamicProxy
/// implemented explicitly; otherwise <see langword="false"/>.
/// </param>
/// <param name="targetMethods">
/// The dictionary to cache the list of target
/// The dictionary to cache the list of target
/// <see cref="System.Reflection.MethodInfo"/>s.
/// </param>
public TargetAopProxyMethodBuilder(TypeBuilder typeBuilder,
public TargetAopProxyMethodBuilder(TypeBuilder typeBuilder,
IAopProxyTypeGenerator aopProxyGenerator, bool explicitImplementation, IDictionary<string, MethodInfo> targetMethods)
: base(typeBuilder, aopProxyGenerator, explicitImplementation, targetMethods)
{
@@ -74,7 +73,7 @@ namespace Spring.Aop.Framework.DynamicProxy
}
/// <summary>
/// Generates the IL instructions that pushes
/// Generates the IL instructions that pushes
/// the target instance on which calls should be delegated to.
/// </summary>
/// <param name="il">The IL generator to use.</param>

8
src/Spring/Spring.Aop/Aop/Framework/HashtableCachingAdvisorChainFactory.cs
View File

@@ -18,14 +18,12 @@
#endregion
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Runtime.Serialization;
namespace Spring.Aop.Framework
{
/// <summary>
/// <summary>
/// <see cref="Spring.Aop.Framework.IAdvisorChainFactory"/> implementation
/// that caches advisor chains on a per-advised-method basis.
/// </summary>
@@ -56,7 +54,7 @@ namespace Spring.Aop.Framework
/// <param name="targetType">
/// The <see cref="System.Type"/> of the target object.
/// </param>
/// <returns>
/// <returns>
/// The list of <see cref="AopAlliance.Intercept.IInterceptor"/> and
/// <see cref="Spring.Aop.Framework.InterceptorAndDynamicMethodMatcher"/>
/// instances for the supplied <paramref name="proxy"/>.
@@ -108,4 +106,4 @@ namespace Spring.Aop.Framework
{
}
}
}
}

19
src/Spring/Spring.Aop/Aop/Framework/IAdvised.cs
View File

@@ -18,9 +18,6 @@
#endregion
using System;
using System.Collections.Generic;
using AopAlliance.Aop;
using Spring.Proxy;
@@ -83,7 +80,7 @@ namespace Spring.Aop.Framework
bool ProxyTargetType { get; }
/// <summary>
/// Is target type attributes, method attributes, method's return type attributes
/// Is target type attributes, method attributes, method's return type attributes
/// and method's parameter attributes to be proxied in addition
/// to any interfaces declared on the proxied <see cref="System.Type"/>?
/// </summary>
@@ -184,7 +181,7 @@ namespace Spring.Aop.Framework
/// <remarks>
/// <p>
/// Please be aware that Spring.NET's AOP implementation only supports
/// method advice (as encapsulated by the
/// method advice (as encapsulated by the
/// <see cref="AopAlliance.Intercept.IMethodInterceptor"/> interface).
/// </p>
/// </remarks>
@@ -202,7 +199,7 @@ namespace Spring.Aop.Framework
/// <remarks>
/// <p>
/// Please be aware that Spring.NET's AOP implementation only supports
/// method advice (as encapsulated by the
/// method advice (as encapsulated by the
/// <see cref="AopAlliance.Intercept.IMethodInterceptor"/> interface).
/// </p>
/// </remarks>
@@ -234,7 +231,7 @@ namespace Spring.Aop.Framework
bool IsInterfaceProxied(Type intf);
/// <summary>
/// Adds the advisors from the supplied <paramref name="advisors"/>
/// Adds the advisors from the supplied <paramref name="advisors"/>
/// to the list of <see cref="Spring.Aop.Framework.IAdvised.Advisors"/>.
/// </summary>
/// <param name="advisors">
@@ -308,7 +305,7 @@ namespace Spring.Aop.Framework
/// </exception>
void AddIntroduction(int index, IIntroductionAdvisor introductionAdvisor);
/// <summary>
/// <summary>
/// Return the index (0 based) of the supplied
/// <see cref="Spring.Aop.IAdvisor"/> in the interceptor
/// (advice) chain for this proxy.
@@ -330,7 +327,7 @@ namespace Spring.Aop.Framework
/// </returns>
int IndexOf(IAdvisor advisor);
/// <summary>
/// <summary>
/// Return the index (0 based) of the supplied
/// <see cref="Spring.Aop.IIntroductionAdvisor"/> in the introductions
/// for this proxy.
@@ -458,7 +455,7 @@ namespace Spring.Aop.Framework
/// </exception>
void ReplaceIntroduction(int index, IIntroductionAdvisor introduction);
/// <summary>
/// <summary>
/// Replaces the <paramref name="oldAdvisor"/> with the
/// <paramref name="newAdvisor"/>.
/// </summary>
@@ -492,4 +489,4 @@ namespace Spring.Aop.Framework
/// </returns>
string ToProxyConfigString();
}
}
}

8
src/Spring/Spring.Aop/Aop/Framework/IAdvisorChainFactory.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,8 +20,6 @@
#region Imports
using System;
using System.Collections.Generic;
using System.Reflection;
#endregion
@@ -48,11 +46,11 @@ namespace Spring.Aop.Framework
/// <param name="targetType">
/// The <see cref="System.Type"/> of the target object.
/// </param>
/// <returns>
/// <returns>
/// The list of <see cref="AopAlliance.Intercept.IInterceptor"/> and
/// <see cref="Spring.Aop.Framework.InterceptorAndDynamicMethodMatcher"/>
/// instances for the supplied <paramref name="proxy"/>.
/// </returns>
IList<object> GetInterceptors(IAdvised advised, object proxy, MethodInfo method, Type targetType);
}
}
}

6
src/Spring/Spring.Aop/Aop/Framework/InterceptorAndDynamicMethodMatcher.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -18,8 +18,6 @@
#endregion
using System;
using AopAlliance.Intercept;
namespace Spring.Aop.Framework
@@ -44,4 +42,4 @@ namespace Spring.Aop.Framework
this.MethodMatcher = methodMatcher;
}
}
}
}

11
src/Spring/Spring.Aop/Aop/Framework/ProxyConfig.cs
View File

@@ -1,5 +1,5 @@
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -14,7 +14,6 @@
* limitations under the License.
*/
using System;
using System.Runtime.Serialization;
using System.Text;
@@ -29,7 +28,7 @@ namespace Spring.Aop.Framework
/// </summary>
/// <remarks>
/// <p>
/// Note that it is no longer possible to configure subclasses to
/// Note that it is no longer possible to configure subclasses to
/// expose the <see cref="AopAlliance.Intercept.IMethodInvocation"/>.
/// Interceptors should normally manage their own thread locals if they
/// need to make resources available to advised objects. If it is
@@ -102,7 +101,7 @@ namespace Spring.Aop.Framework
}
/// <summary>
/// Is target type attributes, method attributes, method's return type attributes
/// Is target type attributes, method attributes, method's return type attributes
/// and method's parameter attributes to be proxied in addition
/// to any interfaces declared on the proxied <see cref="System.Type"/>?
/// </summary>
@@ -169,7 +168,7 @@ namespace Spring.Aop.Framework
/// <see cref="Spring.Aop.Framework.IAopProxyFactory"/> implementation
/// could return an <see cref="Spring.Aop.Framework.IAopProxy"/>
/// using remoting proxies, <c>Reflection.Emit</c> or a code generation
/// strategy.
/// strategy.
/// </p>
/// </remarks>
public virtual IAopProxyFactory AopProxyFactory
@@ -235,4 +234,4 @@ namespace Spring.Aop.Framework
return buffer.ToString();
}
}
}
}

7
src/Spring/Spring.Aop/Aop/Framework/ProxyFactory.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -18,7 +18,6 @@
#endregion
using System;
using System.Runtime.Serialization;
using AopAlliance.Intercept;
@@ -76,7 +75,7 @@ namespace Spring.Aop.Framework
}
/// <summary>
/// Creates a new instance of the <see cref="ProxyFactory"/> class for the
/// Creates a new instance of the <see cref="ProxyFactory"/> class for the
/// given interface and interceptor.
/// </summary>
/// <remarks>Convenience method for creating a proxy for a single interceptor
@@ -160,4 +159,4 @@ namespace Spring.Aop.Framework
return proxyFactory.GetProxy();
}
}
}
}

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

@@ -14,8 +14,6 @@
* limitations under the License.
*/
using System;
using System.Collections.Generic;
using System.Runtime.Serialization;
using AopAlliance.Aop;
@@ -152,7 +150,7 @@ namespace Spring.Aop.Framework
private bool initialized;
/// <summary>
/// Indicate whether this config shall be frozen upon creation
/// Indicate whether this config shall be frozen upon creation
/// of the first proxy instance
/// </summary>
private bool freezeProxy;
@@ -188,7 +186,7 @@ namespace Spring.Aop.Framework
}
/// <summary>
/// Indicate whether this config shall be frozen upon creation
/// Indicate whether this config shall be frozen upon creation
/// of the first proxy instance
/// </summary>
public bool FreezeProxy
@@ -264,7 +262,7 @@ namespace Spring.Aop.Framework
set { targetName = value; }
}
/// <summary>
/// <summary>
/// Sets the list of <see cref="AopAlliance.Intercept.IMethodInterceptor"/> and
/// <see cref="Spring.Aop.IAdvisor"/> object names.
/// </summary>
@@ -288,8 +286,8 @@ namespace Spring.Aop.Framework
set { interceptorNames = value; }
}
/// <summary>
/// Sets the list of introduction object names.
/// <summary>
/// Sets the list of introduction object names.
/// </summary>
/// <remarks>
/// <p>
@@ -339,7 +337,7 @@ namespace Spring.Aop.Framework
}
/// <summary>
/// <summary>
/// Creates an instance of the AOP proxy to be returned by this factory
/// </summary>
/// <remarks>
@@ -379,10 +377,10 @@ namespace Spring.Aop.Framework
}
/// <summary>
/// Return the <see cref="System.Type"/> of the proxy.
/// Return the <see cref="System.Type"/> of the proxy.
/// </summary>
/// <remarks>
/// Will check the singleton instance if already created,
/// Will check the singleton instance if already created,
/// else fall back to the proxy interface (if a single one),
/// the target bean type, or the TargetSource's target class.
/// </remarks>
@@ -488,7 +486,7 @@ namespace Spring.Aop.Framework
/// <summary>Create the advisor (interceptor) chain.</summary>
/// <remarks>
/// The advisors that are sourced from an ObjectFactory will be refreshed each time
/// a new prototype instance is added. Interceptors added programmatically through
/// a new prototype instance is added. Interceptors added programmatically through
/// the factory API are unaffected by such changes.
/// </remarks>
private void InitializeAdvisorChain()
@@ -611,7 +609,7 @@ namespace Spring.Aop.Framework
ObjectFactoryUtils.ObjectNamesForTypeIncludingAncestors(objectFactory, typeof(IAdvisor));
var globalInterceptorNames =
ObjectFactoryUtils.ObjectNamesForTypeIncludingAncestors(objectFactory, typeof(IInterceptor));
List<object> objects = new List<object>();
Dictionary<object, string> names = new Dictionary<object, string>();
for (int i = 0; i < globalAspectNames.Count; i++)
@@ -1024,4 +1022,4 @@ namespace Spring.Aop.Framework
}
}
}
}
}

13
src/Spring/Spring.Aop/Aop/Framework/ReflectiveMethodInvocation.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,7 +20,6 @@
#region Imports
using System;
using System.Collections;
using System.Reflection;
@@ -66,7 +65,7 @@ namespace Spring.Aop.Framework
/// parameters is <see langword="null"/>.
/// </exception>
public ReflectiveMethodInvocation(
object proxy, object target, MethodInfo method, MethodInfo proxyMethod,
object proxy, object target, MethodInfo method, MethodInfo proxyMethod,
object[] arguments, Type targetType, IList interceptors)
: base(proxy, target, method, arguments, targetType, interceptors)
{
@@ -102,7 +101,7 @@ namespace Spring.Aop.Framework
try
{
MethodInfo targetMethodInfo = ProxyMethod ?? Method;
AssertUtils.Understands(Target, "target", targetMethodInfo);
return targetMethodInfo.Invoke(Target, Arguments);
}
@@ -113,8 +112,8 @@ namespace Spring.Aop.Framework
}
/// <summary>
/// Creates a new <see cref="Spring.Aop.Framework.ReflectiveMethodInvocation"/> instance
/// from the specified <see cref="AopAlliance.Intercept.IMethodInvocation"/> and
/// Creates a new <see cref="Spring.Aop.Framework.ReflectiveMethodInvocation"/> instance
/// from the specified <see cref="AopAlliance.Intercept.IMethodInvocation"/> and
/// increments the interceptor index.
/// </summary>
/// <param name="invocation">
@@ -131,4 +130,4 @@ namespace Spring.Aop.Framework
return rmi;
}
}
}
}

6
src/Spring/Spring.Aop/Aop/IAdvisors.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,8 +20,6 @@
#region Imports
using System.Collections.Generic;
#endregion
namespace Spring.Aop
@@ -41,4 +39,4 @@ namespace Spring.Aop
/// </value>
IList<IAdvisor> Advisors { get; set; }
}
}
}

10
src/Spring/Spring.Aop/Aop/IIntroductionAdvisor.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,8 +20,6 @@
#region Imports
using System;
#endregion
namespace Spring.Aop
@@ -47,7 +45,7 @@ namespace Spring.Aop
{
/// <summary>
/// Returns the filter determining which target classes this
/// introduction should apply to.
/// introduction should apply to.
/// </summary>
/// <remarks>
/// <p>
@@ -58,7 +56,7 @@ namespace Spring.Aop
/// </remarks>
/// <value>
/// The filter determining which target classes this introduction
/// should apply to.
/// should apply to.
/// </value>
ITypeFilter TypeFilter { get; }
@@ -89,4 +87,4 @@ namespace Spring.Aop
/// <seealso cref="Spring.Aop.IIntroductionAdvisor.Interfaces"/>
void ValidateInterfaces();
}
}
}

7
src/Spring/Spring.Aop/Aop/IIntroductionInterceptor.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,14 +20,13 @@
#region Imports
using System;
using AopAlliance.Intercept;
#endregion
namespace Spring.Aop
{
/// <summary>
/// <summary>
/// Subinterface of the AOP Alliance
/// <see cref="AopAlliance.Intercept.IMethodInterceptor"/> interface that
/// allows additional interfaces to be implemented by the interceptor, and
@@ -58,4 +57,4 @@ namespace Spring.Aop
/// </returns>
bool ImplementsInterface(Type intf);
}
}
}

5
src/Spring/Spring.Aop/Aop/IMethodMatcher.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,7 +20,6 @@
#region Imports
using System;
using System.Reflection;
#endregion
@@ -147,4 +146,4 @@ namespace Spring.Aop
/// <see langword="true"/> if there is a runtime match.</returns>
bool Matches(MethodInfo method, Type targetType, object[] args);
}
}
}

6
src/Spring/Spring.Aop/Aop/ITargetSource.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,8 +20,6 @@
#region Imports
using System;
#endregion
namespace Spring.Aop
@@ -76,4 +74,4 @@ namespace Spring.Aop
/// <param name="target">The target object to release.</param>
void ReleaseTarget(object target);
}
}
}

6
src/Spring/Spring.Aop/Aop/ITypeFilter.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,8 +20,6 @@
#region Imports
using System;
#endregion
namespace Spring.Aop
@@ -55,4 +53,4 @@ namespace Spring.Aop
/// </returns>
bool Matches(Type type);
}
}
}

5
src/Spring/Spring.Aop/Aop/Support/AbstractGenericPointcutAdvisor.cs
View File

@@ -18,7 +18,6 @@
#endregion
using System;
using AopAlliance.Aop;
namespace Spring.Aop.Support
@@ -47,7 +46,7 @@ namespace Spring.Aop.Support
}
///<summary>
/// 2 <see cref="AbstractGenericPointcutAdvisor"/>s are considered equals, if
/// 2 <see cref="AbstractGenericPointcutAdvisor"/>s are considered equals, if
/// a) their pointcuts are equal
/// b) their advices are equal
///</summary>
@@ -76,4 +75,4 @@ namespace Spring.Aop.Support
return GetType().Name + ": advice=[" + Advice + "]";
}
}
}
}

7
src/Spring/Spring.Aop/Aop/Support/AbstractPointcutAdvisor.cs
View File

@@ -14,14 +14,13 @@
* limitations under the License.
*/
using System;
using AopAlliance.Aop;
using Spring.Core;
namespace Spring.Aop.Support
{
/// <summary>
/// Abstract base class for <see cref="IPointcutAdvisor"/> implementations.
/// Abstract base class for <see cref="IPointcutAdvisor"/> implementations.
/// </summary>
/// <remarks>
/// Can be subclassed for returning a specific pointcut/advice or a freely configurable pointcut/advice.
@@ -93,7 +92,7 @@ namespace Spring.Aop.Support
/// <summary>
/// Determines whether the specified <see cref="System.Object"/>
/// is equal to the current <see cref="System.Object"/>.
/// is equal to the current <see cref="System.Object"/>.
/// </summary>
/// <param name="o">The advisor to compare with.</param>
/// <returns>
@@ -150,4 +149,4 @@ namespace Spring.Aop.Support
+ 31 * Order.GetHashCode();
}
}
}
}

5
src/Spring/Spring.Aop/Aop/Support/AbstractRegularExpressionMethodPointcut.cs
View File

@@ -1,5 +1,5 @@
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -14,7 +14,6 @@
* limitations under the License.
*/
using System;
using System.Reflection;
using System.Runtime.Serialization;
using System.Security.Permissions;
@@ -250,4 +249,4 @@ namespace Spring.Aop.Support
return true;
}
}
}
}

15
src/Spring/Spring.Aop/Aop/Support/AttributeMatchMethodPointcut.cs
View File

@@ -2,13 +2,13 @@
/*
* Copyright 2002-2010 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.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,7 +20,6 @@
#region Imports
using System;
using System.Reflection;
using System.Runtime.Serialization;
@@ -30,7 +29,7 @@ using Spring.Util;
namespace Spring.Aop.Support
{
/// <summary>
/// <summary>
/// <see cref="Spring.Aop.IPointcut"/> implementation that matches methods
/// that have been decorated with a specified <see cref="System.Attribute"/>.
/// </summary>
@@ -111,7 +110,7 @@ namespace Spring.Aop.Support
var type = info.GetString("Attribute");
Attribute = type != null ? Type.GetType(type) : null;
}
/// <inheritdoc />
public virtual void GetObjectData(SerializationInfo info, StreamingContext context)
{
@@ -162,7 +161,7 @@ namespace Spring.Aop.Support
}
/// <summary>
/// Is the interfaces attributes of the method to be included in the search for theg
/// Is the interfaces attributes of the method to be included in the search for theg
/// <see cref="Attribute"/>?
/// </summary>
/// <remarks>
@@ -229,4 +228,4 @@ namespace Spring.Aop.Support
}
}
}
}
}

9
src/Spring/Spring.Aop/Aop/Support/AttributeMatchMethodPointcutAdvisor.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,7 +20,6 @@
#region Imports
using System;
using System.Runtime.Serialization;
using AopAlliance.Aop;
@@ -30,7 +29,7 @@ using Spring.Core;
namespace Spring.Aop.Support
{
/// <summary>
/// <summary>
/// Convenient class for attribute-match method pointcuts that hold an Interceptor,
/// making them an Advisor.
/// </summary>
@@ -87,7 +86,7 @@ namespace Spring.Aop.Support
Order = info.GetInt32("Order");
Advice = (IAdvice) info.GetValue("Advice", typeof(IAdvice));
}
/// <inheritdoc />
public override void GetObjectData(SerializationInfo info, StreamingContext context)
{
@@ -151,4 +150,4 @@ namespace Spring.Aop.Support
get { return this; }
}
}
}
}

3
src/Spring/Spring.Aop/Aop/Support/AttributeMatchingPointcut.cs
View File

@@ -18,7 +18,6 @@
#endregion
using System;
using Spring.Util;
namespace Spring.Aop.Support
@@ -119,4 +118,4 @@ namespace Spring.Aop.Support
}
}
}
}
}

11
src/Spring/Spring.Aop/Aop/Support/AttributeMethodMatcher.cs
View File

@@ -18,7 +18,6 @@
#endregion
using System;
using System.Reflection;
using System.Runtime.Serialization;
@@ -41,7 +40,7 @@ namespace Spring.Aop.Support
/// <summary>
/// Initializes a new instance of the <see cref="AttributeMethodMatcher"/> class for the
/// Initializes a new instance of the <see cref="AttributeMethodMatcher"/> class for the
/// given atribute type.
/// </summary>
/// <param name="attributeType">Type of the attribute to look for.</param>
@@ -57,7 +56,7 @@ namespace Spring.Aop.Support
var type = info.GetString("AttributeType");
attributeType = type != null ? Type.GetType(type) : null;
}
/// <inheritdoc />
public void GetObjectData(SerializationInfo info, StreamingContext context)
{
@@ -90,7 +89,7 @@ namespace Spring.Aop.Support
}
else
{
Type[] parameterTypes = ReflectionUtils.GetParameterTypes(method);
// Also check whether the attribute is defined on a method implemented from an interface.
@@ -105,7 +104,7 @@ namespace Spring.Aop.Support
return true;
}
}
return false;
}
}
@@ -122,4 +121,4 @@ namespace Spring.Aop.Support
}
}
}
}
}

11
src/Spring/Spring.Aop/Aop/Support/AttributeTypeFilter.cs
View File

@@ -18,7 +18,6 @@
#endregion
using System;
using Spring.Util;
namespace Spring.Aop.Support
@@ -51,12 +50,12 @@ namespace Spring.Aop.Support
/// <summary>
/// Initializes a new instance of the <see cref="AttributeTypeFilter"/> class for the
/// given attribute type.
/// given attribute type.
/// </summary>
/// <param name="attributeType">Type of the attribute to look for.</param>
public AttributeTypeFilter(Type attributeType) : this(attributeType, false)
{
}
/// <summary>
@@ -94,15 +93,15 @@ namespace Spring.Aop.Support
{
if (checkInherited)
{
return AttributeUtils.FindAttribute(type, attributeType) != null;
return AttributeUtils.FindAttribute(type, attributeType) != null;
}
else
{
object[] atts = type.GetCustomAttributes(attributeType, false);
return ArrayUtils.HasLength(atts);
}
}
}
}
}
}

12
src/Spring/Spring.Aop/Aop/Support/ComposablePointcut.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,8 +20,6 @@
#region Imports
using System;
#endregion
namespace Spring.Aop.Support
@@ -44,7 +42,7 @@ namespace Spring.Aop.Support
/// There is no <c>Union()</c> method on this class. Use the
/// <see cref="Spring.Aop.Support.Pointcuts.Union"/> method for such functionality.
/// </p>
/// </remarks>
/// </remarks>
/// <author>Rod Johnson</author>
/// <author>Aleksandar Seovic (.NET)</author>
[Serializable]
@@ -54,7 +52,7 @@ namespace Spring.Aop.Support
private IMethodMatcher _methodMatcher;
/// <summary>
/// Creates a new instance of the
/// Creates a new instance of the
/// <see cref="Spring.Aop.Support.ComposablePointcut"/> class
/// that matches all the methods on all <see cref="System.Type"/>s.
/// </summary>
@@ -65,7 +63,7 @@ namespace Spring.Aop.Support
}
/// <summary>
/// Creates a new instance of the
/// Creates a new instance of the
/// <see cref="Spring.Aop.Support.ComposablePointcut"/> class
/// that uses the supplied <paramref name="typeFilter"/> and
/// <paramref name="methodMatcher"/>.
@@ -172,4 +170,4 @@ namespace Spring.Aop.Support
return this;
}
}
}
}

7
src/Spring/Spring.Aop/Aop/Support/ControlFlowPointcut.cs
View File

@@ -1,5 +1,5 @@
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -14,7 +14,6 @@
* limitations under the License.
*/
using System;
using System.Reflection;
using System.Runtime.Serialization;
@@ -84,7 +83,7 @@ namespace Spring.Aop.Support
_methodName = info.GetString("MethodName");
_evaluationCount = info.GetInt32("EvaluationCount");
}
/// <inheritdoc />
public void GetObjectData(SerializationInfo info, StreamingContext context)
{
@@ -235,4 +234,4 @@ namespace Spring.Aop.Support
: cflow.Under(_type);
}
}
}
}

11
src/Spring/Spring.Aop/Aop/Support/DefaultIntroductionAdvisor.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,7 +20,6 @@
#region Imports
using System;
using AopAlliance.Aop;
using Spring.Collections;
@@ -103,11 +102,11 @@ namespace Spring.Aop.Support
/// <summary>
/// Returns the filter determining which target classes this
/// introduction should apply to.
/// introduction should apply to.
/// </summary>
/// <value>
/// The filter determining which target classes this introduction
/// should apply to.
/// should apply to.
/// </value>
public virtual ITypeFilter TypeFilter
{
@@ -170,7 +169,7 @@ namespace Spring.Aop.Support
/// </exception>
public virtual void AddInterface(Type intf)
{
if(intf != null)
if(intf != null)
{
BailIfNotAnInterfaceType(intf);
_interfaces.Add(intf);
@@ -277,4 +276,4 @@ namespace Spring.Aop.Support
}
}
}
}
}

7
src/Spring/Spring.Aop/Aop/Support/DefaultPointcutAdvisor.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,7 +20,6 @@
#region Imports
using System;
using AopAlliance.Aop;
#endregion
@@ -93,7 +92,7 @@ namespace Spring.Aop.Support
///<summary>
/// 2 <see cref="DefaultPointcutAdvisor"/>s are considered equal, if
/// 2 <see cref="DefaultPointcutAdvisor"/>s are considered equal, if
/// a) their pointcuts are equal
/// b) their advices are equal
///</summary>
@@ -122,4 +121,4 @@ namespace Spring.Aop.Support
return GetType().Name + ": pointcut=[" + pointcut + "] advice=[" + Advice + "]";
}
}
}
}

5
src/Spring/Spring.Aop/Aop/Support/DynamicMethodMatcher.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,7 +20,6 @@
#region Imports
using System;
using System.Reflection;
#endregion
@@ -111,4 +110,4 @@ namespace Spring.Aop.Support
/// <see langword="true"/> if there is a runtime match.</returns>
public abstract bool Matches(MethodInfo method, Type targetType, object[] args);
}
}
}

5
src/Spring/Spring.Aop/Aop/Support/DynamicMethodMatcherPointcutAdvisor.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,7 +20,6 @@
#region Imports
using System;
using AopAlliance.Aop;
using Spring.Core;
@@ -172,4 +171,4 @@ namespace Spring.Aop.Support
get { return this; }
}
}
}
}

7
src/Spring/Spring.Aop/Aop/Support/MethodMatchers.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,7 +20,6 @@
#region Imports
using System;
using System.Reflection;
#endregion
@@ -48,7 +47,7 @@ namespace Spring.Aop.Support
/// </summary>
/// <remarks>
/// <p>
/// The newly created matcher will match all the methods that either of the two
/// The newly created matcher will match all the methods that either of the two
/// supplied matchers would match.
/// </p>
/// </remarks>
@@ -177,4 +176,4 @@ namespace Spring.Aop.Support
#endregion
}
}
}

7
src/Spring/Spring.Aop/Aop/Support/NameMatchMethodPointcut.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,7 +20,6 @@
#region Imports
using System;
using System.Reflection;
using Spring.Util;
@@ -28,7 +27,7 @@ using Spring.Util;
namespace Spring.Aop.Support
{
/// <summary>
/// <summary>
/// Pointcut object for simple method name matches, useful as an alternative to pure
/// regular expression based patterns.
/// </summary>
@@ -118,4 +117,4 @@ namespace Spring.Aop.Support
return PatternMatchUtils.SimpleMatch(mappedName, methodName);
}
}
}
}

6
src/Spring/Spring.Aop/Aop/Support/NameMatchMethodPointcutAdvisor.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,8 +20,6 @@
#region Imports
using System;
using AopAlliance.Aop;
using Spring.Util;
@@ -127,4 +125,4 @@ namespace Spring.Aop.Support
#endregion
}
}
}

9
src/Spring/Spring.Aop/Aop/Support/Pointcuts.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,14 +20,13 @@
#region Imports
using System;
using System.Reflection;
#endregion
namespace Spring.Aop.Support
{
/// <summary>
/// <summary>
/// Various <see cref="Spring.Aop.IPointcut"/> related utility methods.
/// </summary>
/// <remarks>
@@ -87,7 +86,7 @@ namespace Spring.Aop.Support
public static bool Matches(
IPointcut pointcut, MethodInfo method, Type targetType, object[] args)
{
if(pointcut != null)
if(pointcut != null)
{
if (pointcut == TruePointcut.True)
{
@@ -142,4 +141,4 @@ namespace Spring.Aop.Support
#endregion
}
}
}

9
src/Spring/Spring.Aop/Aop/Support/RegularExpressionMethodPointcutAdvisor.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,7 +20,6 @@
#region Imports
using System;
using AopAlliance.Aop;
using Spring.Util;
@@ -120,8 +119,8 @@ namespace Spring.Aop.Support
public override IPointcut Pointcut
{
get { return pointcut; }
set {
AssertUtils.AssertArgumentType(value, "pointcut", typeof(AbstractRegularExpressionMethodPointcut),
set {
AssertUtils.AssertArgumentType(value, "pointcut", typeof(AbstractRegularExpressionMethodPointcut),
"Pointcut most be compatible with type AbstractRegularExpressionMethodPointuct");
pointcut = value as AbstractRegularExpressionMethodPointcut;
}
@@ -137,4 +136,4 @@ namespace Spring.Aop.Support
pointcut = new SdkRegularExpressionMethodPointcut();
}
}
}
}

5
src/Spring/Spring.Aop/Aop/Support/RootTypeFilter.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,7 +20,6 @@
#region Imports
using System;
using Spring.Util;
#endregion
@@ -76,4 +75,4 @@ namespace Spring.Aop.Support
return _rootType.IsAssignableFrom(type);
}
}
}
}

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

@@ -1,12 +1,12 @@
/*
* Copyright 2002-2010 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.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,7 +14,6 @@
* limitations under the License.
*/
using System;
using System.Runtime.Serialization;
using System.Text.RegularExpressions;
using Common.Logging;
@@ -78,7 +77,7 @@ namespace Spring.Aop.Support
/// regular expressions that don't have options explicitly set.
/// </summary>
/// <value>
/// Default options that should be used by regular expressions
/// Default options that should be used by regular expressions
/// that don't have options explicitly set.
/// </value>
public RegexOptions DefaultOptions
@@ -168,4 +167,4 @@ namespace Spring.Aop.Support
return matched;
}
}
}
}

9
src/Spring/Spring.Aop/Aop/Support/StaticMethodMatcher.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,7 +20,6 @@
#region Imports
using System;
using System.Reflection;
using System.Runtime.Serialization;
@@ -28,9 +27,9 @@ using System.Runtime.Serialization;
namespace Spring.Aop.Support
{
/// <summary>
/// <summary>
/// Convenient abstract superclass for static method matchers that don't care
/// about arguments at runtime.
/// about arguments at runtime.
/// </summary>
/// <author>Rod Johnson</author>
/// <author>Aleksandar Seovic (.NET)</author>
@@ -113,4 +112,4 @@ namespace Spring.Aop.Support
{
}
}
}
}

8
src/Spring/Spring.Aop/Aop/Support/StaticMethodMatcherPointcut.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -18,11 +18,9 @@
#endregion
using System;
namespace Spring.Aop.Support
{
/// <summary>
/// <summary>
/// Convenient superclass when one wants to force subclasses to
/// implement the <see cref="Spring.Aop.IMethodMatcher"/> interface
/// but subclasses will still want to be pointcuts.
@@ -80,4 +78,4 @@ namespace Spring.Aop.Support
get { return this; }
}
}
}
}

5
src/Spring/Spring.Aop/Aop/Support/StaticMethodMatcherPointcutAdvisor.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,7 +20,6 @@
#region Imports
using System;
using AopAlliance.Aop;
using Spring.Core;
@@ -130,4 +129,4 @@ namespace Spring.Aop.Support
get { return this; }
}
}
}
}

6
src/Spring/Spring.Aop/Aop/Support/TypeFilters.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,8 +20,6 @@
#region Imports
using System;
#endregion
namespace Spring.Aop.Support
@@ -154,4 +152,4 @@ namespace Spring.Aop.Support
#endregion
}
}
}

5
src/Spring/Spring.Aop/Aop/Support/TypeNameTypeFilter.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,7 +20,6 @@
#region Imports
using System;
using Spring.Util;
#endregion
@@ -72,4 +71,4 @@ namespace Spring.Aop.Support
return PatternMatchUtils.SimpleMatch(_typeNamePatterns, type.FullName);
}
}
}
}

7
src/Spring/Spring.Aop/Aop/Support/UnionPointcut.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,14 +20,13 @@
#region Imports
using System;
using System.Reflection;
#endregion
namespace Spring.Aop.Support
{
/// <summary>
/// <summary>
/// A <see cref="Spring.Aop.IPointcut"/> union.
/// </summary>
/// <remarks>
@@ -121,4 +120,4 @@ namespace Spring.Aop.Support
}
}
}
}
}

11
src/Spring/Spring.Aop/Aop/Target/AbstractPoolingTargetSource.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,7 +20,6 @@
#region Imports
using System;
using AopAlliance.Aop;
using Spring.Aop.Support;
using Spring.Objects;
@@ -36,7 +35,7 @@ namespace Spring.Aop.Target
/// <remarks>
/// <p>
/// Maintains a pool of target instances, acquiring and releasing a target
/// object from the pool for each method invocation.
/// object from the pool for each method invocation.
/// </p>
/// <p>
/// This class is independent of pooling technology.
@@ -162,7 +161,7 @@ namespace Spring.Aop.Target
}
}
}
/// <summary>
/// Create the pool.
/// </summary>
@@ -193,11 +192,11 @@ namespace Spring.Aop.Target
/// </summary>
/// <remarks>
/// <p>
/// Disposes of the pool.
/// Disposes of the pool.
/// </p>
/// </remarks>
public abstract void Dispose();
private int _maxSize;
}
}
}

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

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,8 +20,6 @@
#region Imports
using System;
using Common.Logging;
using Spring.Objects.Factory;
@@ -82,7 +80,7 @@ namespace Spring.Aop.Target
public virtual string TargetObjectName
{
get { return _targetObjectName; }
set {
set {
_targetObjectName = value;
}
}
@@ -147,7 +145,7 @@ namespace Spring.Aop.Target
}
#endregion
_targetType = _owningObjectFactory.GetType(TargetObjectName);
}
}
@@ -251,4 +249,4 @@ namespace Spring.Aop.Target
#endregion
}
}
}

3
src/Spring/Spring.Aop/Aop/Target/EmptyTargetSource.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,7 +20,6 @@
#region Imports
using System;
using System.Runtime.Serialization;
using System.Security.Permissions;

5
src/Spring/Spring.Aop/Aop/Target/HotSwappableTargetSource.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,7 +20,6 @@
#region Imports
using System;
using Spring.Util;
#endregion
@@ -174,4 +173,4 @@ namespace Spring.Aop.Target
(_target == null ? 0 : _target.GetHashCode());
}
}
}
}

6
src/Spring/Spring.Aop/Aop/Target/PrototypeTargetSource.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,8 +20,6 @@
#region Imports
using System;
#endregion
namespace Spring.Aop.Target
@@ -75,4 +73,4 @@ namespace Spring.Aop.Target
get { return false; }
}
}
}
}

3
src/Spring/Spring.Aop/Aop/Target/SimplePoolTargetSource.cs
View File

@@ -20,7 +20,6 @@
#region Imports
using System;
using Spring.Objects.Factory;
using Spring.Pool;
using Spring.Pool.Support;
@@ -204,4 +203,4 @@ namespace Spring.Aop.Target
{
}
}
}
}

9
src/Spring/Spring.Aop/Aop/Target/SingletonTargetSource.cs
View File

@@ -1,5 +1,5 @@
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -14,7 +14,6 @@
* limitations under the License.
*/
using System;
using System.Runtime.Serialization;
using Spring.Util;
@@ -124,7 +123,7 @@ namespace Spring.Aop.Target
/// <param name="target">The target object to release.</param>
public void ReleaseTarget(object target)
{
}
/// <inheritdoc />
@@ -147,7 +146,7 @@ namespace Spring.Aop.Target
/// <summary>
/// Determines whether the specified <see cref="System.Object"/>
/// is equal to the current <see cref="System.Object"/>.
/// is equal to the current <see cref="System.Object"/>.
/// </summary>
/// <param name="other">The target source to compare with.</param>
/// <returns>
@@ -181,4 +180,4 @@ namespace Spring.Aop.Target
(target == null ? 0 : target.GetHashCode());
}
}
}
}

9
src/Spring/Spring.Aop/Aop/Target/ThreadLocalTargetSource.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,9 +20,6 @@
#region Imports
using System;
using System.Threading;
using AopAlliance.Intercept;
using Spring.Aop.Support;
@@ -49,7 +46,7 @@ namespace Spring.Aop.Target
/// AOP proxy.
/// </p>
/// <p>
/// This class act both as an introduction and as an interceptor, so it
/// This class act both as an introduction and as an interceptor, so it
/// should be added twice, once as an introduction and once as an
/// interceptor.
/// </p>
@@ -241,4 +238,4 @@ namespace Spring.Aop.Target
#endregion
}
}
}

3
src/Spring/Spring.Aop/Aop/TrueMethodMatcher.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,7 +20,6 @@
#region Imports
using System;
using System.Reflection;
using System.Runtime.Serialization;
using System.Security.Permissions;

3
src/Spring/Spring.Aop/Aop/TruePointcut.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,7 +20,6 @@
#region Imports
using System;
using System.Runtime.Serialization;
using System.Security.Permissions;

5
src/Spring/Spring.Aop/Aop/TrueTypeFilter.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright <EFBFBD> 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.
@@ -20,7 +20,6 @@
#region Imports
using System;
using System.Runtime.Serialization;
using System.Security.Permissions;
@@ -109,4 +108,4 @@ namespace Spring.Aop
}
}
}
}
}

3
src/Spring/Spring.Aop/AopAlliance/Aop/AspectException.cs
View File

@@ -11,7 +11,6 @@
#region Imports
using System;
using System.Runtime.Serialization;
#endregion
@@ -65,4 +64,4 @@ namespace AopAlliance.Aop
{
}
}
}
}

7
src/Spring/Spring.Aop/AopAlliance/Intercept/IMethodInvocation.cs
View File

@@ -2,16 +2,15 @@
/*
* All the source code provided by AOP Alliance is Public Domain.
*
*
* http://aopalliance.sourceforge.net/
*
*
*/
#endregion
#region Imports
using System;
using System.Reflection;
#endregion
@@ -74,4 +73,4 @@ namespace AopAlliance.Intercept
Type TargetType { get; }
}
}
}

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