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

Create ConfigurableVariableSource to allow inline variables definitions with VariablePlaceholderConfigurer (SPRNET-1426)

Browse Source
This commit is contained in:
bbaia
2011-04-04 10:59:56 +00:00
parent 3fe86e6d2e
commit 768f26559b
13 changed files with 166 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/reference/src/objects.xml
View File

@@ -5006,6 +5006,10 @@ cfg.PostProcessObjectFactory(factory);</programlisting></para>
<listitem>
<para><literal>ConnectionStringsVariableSource</literal></para>
</listitem>
<listitem>
<para><literal>ConfigurableVariableSource</literal></para>
</listitem>
</itemizedlist>
<para>You use this by defining an instance of

85
src/Spring/Spring.Core/Objects/Factory/Config/ConfigurableVariableSource.cs Normal file
View File

@@ -0,0 +1,85 @@
#region License
/*
* Copyright <20> 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.
* 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 System.Globalization;
using System.Collections;
using System.Collections.Specialized;
using Spring.Util;
namespace Spring.Objects.Factory.Config
{
/// <summary>
/// Implementation of <see cref="IVariableSource"/> that
/// resolves variable name against provided variables.
/// </summary>
/// <remarks>
/// Variable name resolution is case insensitive.
/// </remarks>
/// <author>Bruno Baia</author>
[Serializable]
public class ConfigurableVariableSource : IVariableSource
{
protected NameValueCollection _variables;
/// <summary>
/// Initializes a new instance of <see cref="ConfigurableVariableSource"/>.
/// </summary>
public ConfigurableVariableSource()
{
this._variables = new NameValueCollection();
}
/// <summary>
/// Gets or sets variables.
/// </summary>
public NameValueCollection Variables
{
get { return _variables; }
set { _variables = value; }
}
/// <summary>
/// Before requesting a variable resolution, a client should
/// ask, whether the source can resolve a particular variable name.
/// </summary>
/// <param name="name">the name of the variable to resolve</param>
/// <returns><c>true</c> if the variable can be resolved, <c>false</c> otherwise</returns>
public bool CanResolveVariable(string name)
{
return this._variables.Get(name) != null;
}
/// <summary>
/// Resolves variable value for the specified variable name.
/// </summary>
/// <param name="name">
/// The name of the variable to resolve.
/// </param>
/// <returns>
/// The variable value if able to resolve, <c>null</c> otherwise.
/// </returns>
public string ResolveVariable(string name)
{
return this._variables.Get(name);
}
}
}

5
src/Spring/Spring.Core/Spring.Core.2002.csproj
View File

@@ -1456,6 +1456,11 @@
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "Objects\Factory\Config\ConfigurableVariableSource.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "Objects\Factory\Config\ConstructorArgumentValues.cs"
SubType = "Code"

5
src/Spring/Spring.Core/Spring.Core.2003.csproj
View File

@@ -2085,6 +2085,11 @@
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "Objects\Factory\Config\ConfigurableVariableSource.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "Objects\Factory\Config\ConstructorArgumentValues.cs"
SubType = "Code"

1
src/Spring/Spring.Core/Spring.Core.2005.csproj
View File

@@ -656,6 +656,7 @@
<Compile Include="Objects\Factory\Config\CommandLineArgsVariableSource.cs" />
<Compile Include="Objects\Factory\Config\ConfigSectionVariableSource.cs" />
<Compile Include="Objects\Factory\Config\ConnectionStringsVariableSource.cs" />
<Compile Include="Objects\Factory\Config\ConfigurableVariableSource.cs" />
<Compile Include="Objects\Factory\Config\ICustomValueReferenceHolder.cs" />
<Compile Include="Objects\Factory\Config\DelegateObjectFactoryConfigurer.cs" />
<Compile Include="Objects\Factory\Config\DependencyDescriptor.cs" />

1
src/Spring/Spring.Core/Spring.Core.2008.csproj
View File

@@ -668,6 +668,7 @@
<Compile Include="Objects\Factory\Config\CommandLineArgsVariableSource.cs" />
<Compile Include="Objects\Factory\Config\ConfigSectionVariableSource.cs" />
<Compile Include="Objects\Factory\Config\ConnectionStringsVariableSource.cs" />
<Compile Include="Objects\Factory\Config\ConfigurableVariableSource.cs" />
<Compile Include="Objects\Factory\Config\ICustomValueReferenceHolder.cs" />
<Compile Include="Objects\Factory\Config\DelegateObjectFactoryConfigurer.cs" />
<Compile Include="Objects\Factory\Config\DependencyDescriptor.cs" />

1
src/Spring/Spring.Core/Spring.Core.2010.csproj
View File

@@ -681,6 +681,7 @@
<Compile Include="Objects\Factory\Config\CommandLineArgsVariableSource.cs" />
<Compile Include="Objects\Factory\Config\ConfigSectionVariableSource.cs" />
<Compile Include="Objects\Factory\Config\ConnectionStringsVariableSource.cs" />
<Compile Include="Objects\Factory\Config\ConfigurableVariableSource.cs" />
<Compile Include="Objects\Factory\Config\ICustomValueReferenceHolder.cs" />
<Compile Include="Objects\Factory\Config\DelegateObjectFactoryConfigurer.cs" />
<Compile Include="Objects\Factory\Config\DependencyDescriptor.cs" />

51
test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConfigurableVariableSourceTests.cs Normal file
View File

@@ -0,0 +1,51 @@
#region License
/*
* Copyright <20> 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.
* 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 NUnit.Framework;
using Spring.Core.IO;
namespace Spring.Objects.Factory.Config
{
/// <summary>
/// Unit tests for the ConfigurableVariableSource class.
/// </summary>
/// <author>Bruno Baia</author>
[TestFixture]
public sealed class ConfigurableVariableSourceTests
{
[Test]
public void Basic()
{
ConfigurableVariableSource vs = new ConfigurableVariableSource();
vs.Variables.Add("Key1", "Value1");
vs.Variables.Add("Key2", "Value2");
// existing vars
Assert.IsTrue(vs.CanResolveVariable("key1")); // case insensitive
Assert.AreEqual("Value1", vs.ResolveVariable("key1")); // case insensitive
Assert.IsTrue(vs.CanResolveVariable("Key2"));
Assert.AreEqual("Value2", vs.ResolveVariable("Key2"));
// non-existant variable
Assert.IsFalse(vs.CanResolveVariable("Key3"));
Assert.IsNull(vs.ResolveVariable("Key3"));
}
}
}

5
test/Spring/Spring.Core.Tests/Spring.Core.Tests.2002.csproj
View File

@@ -1132,6 +1132,11 @@
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "Objects\Factory\Config\ConfigurableVariableSourceTests.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "Objects\Factory\Config\ConstructorArgumentValuesTests.cs"
SubType = "Code"

5
test/Spring/Spring.Core.Tests/Spring.Core.Tests.2003.csproj
View File

@@ -1362,6 +1362,11 @@
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "Objects\Factory\Config\ConfigurableVariableSourceTests.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "Objects\Factory\Config\ConstructorArgumentValuesTests.cs"
SubType = "Code"

1
test/Spring/Spring.Core.Tests/Spring.Core.Tests.2005.csproj
View File

@@ -309,6 +309,7 @@
<Compile Include="Objects\Factory\Config\CommandLineArgsVariableSourceTests.cs" />
<Compile Include="Objects\Factory\Config\ConfigSectionVariableSourceTests.cs" />
<Compile Include="Objects\Factory\Config\ConnectionStringsVariableSourceTests.cs" />
<Compile Include="Objects\Factory\Config\ConfigurableVariableSourceTests.cs" />
<Compile Include="Objects\Factory\Config\DelegateObjectFactoryConfigurerTests.cs" />
<Compile Include="Objects\Factory\Config\ObjectDefinitionVisitorTests.cs" />
<Compile Include="Objects\Factory\Config\ResourceHandlerConfigurerTests.cs" />

1
test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj
View File

@@ -320,6 +320,7 @@
<Compile Include="Objects\Factory\Config\CommandLineArgsVariableSourceTests.cs" />
<Compile Include="Objects\Factory\Config\ConfigSectionVariableSourceTests.cs" />
<Compile Include="Objects\Factory\Config\ConnectionStringsVariableSourceTests.cs" />
<Compile Include="Objects\Factory\Config\ConfigurableVariableSourceTests.cs" />
<Compile Include="Objects\Factory\Config\DelegateObjectFactoryConfigurerTests.cs" />
<Compile Include="Objects\Factory\Config\DictionaryVariableSourceTests.cs" />
<Compile Include="Objects\Factory\Config\ObjectDefinitionVisitorTests.cs" />

1
test/Spring/Spring.Core.Tests/Spring.Core.Tests.2010.csproj
View File

@@ -329,6 +329,7 @@
<Compile Include="Objects\Factory\Config\CommandLineArgsVariableSourceTests.cs" />
<Compile Include="Objects\Factory\Config\ConfigSectionVariableSourceTests.cs" />
<Compile Include="Objects\Factory\Config\ConnectionStringsVariableSourceTests.cs" />
<Compile Include="Objects\Factory\Config\ConfigurableVariableSourceTests.cs" />
<Compile Include="Objects\Factory\Config\DelegateObjectFactoryConfigurerTests.cs" />
<Compile Include="Objects\Factory\Config\DictionaryVariableSourceTests.cs" />
<Compile Include="Objects\Factory\Config\ObjectDefinitionVisitorTests.cs" />