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

SPRNET-1270 - Selection of DefaultProvider in MultiDelegatingDbProvider can be null

Browse Source 
SPRNET-1285 - MultiDelegatingDbProvider in wrong namespace
This commit is contained in:
markpollack
2009-12-03 21:51:51 +00:00
parent 2c1b7227c7
commit 021a05e485
4 changed files with 185 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,14 +21,14 @@
using System;
using System.Collections;
using System.Data;
using Common.Logging;
using Spring.Collections;
using Spring.Dao;
using Spring.Data.Common;
using Spring.Objects.Factory;
using Spring.Threading;
namespace Spring.Data
namespace Spring.Data.Common
{
/// <summary>
/// A wrapper implementation for IDbProvider such that multiple DbProvider instances can be
@@ -49,6 +49,12 @@ namespace Spring.Data
private IDictionary targetDbProviders = new SynchronizedHashtable();
#region Logging Definition
private static readonly ILog LOG = LogManager.GetLogger(typeof(MultiDelegatingDbProvider));
#endregion
#region Constructors
/// <summary>
/// Initializes a new instance of the <see cref="MultiDelegatingDbProvider"/> class.
@@ -102,12 +108,12 @@ namespace Spring.Data
{
if (! entry.Key.GetType().Equals(typeof(string)))
{
throw new ArgumentException("Key identifying target IDbProvider in TargetDbProviders dictionary property is required to be of type string. Key = " + entry.Key);
throw new ArgumentException("Key identifying target IDbProvider in TargetDbProviders dictionary property is required to be of type string. Key = [" + entry.Key + "], type = [" + entry.Key.GetType() + "]");
}
IDbProvider targetProvider = entry.Value as IDbProvider;
if (targetProvider == null)
{
throw new ArgumentException("Value in TargetDbProviders dictionary is not of type IDbProvider.");
throw new ArgumentException("Value in TargetDbProviders dictionary is not of type IDbProvider. Type = [" + entry.Value.GetType() + "]");
}
}
}
@@ -268,16 +274,26 @@ namespace Spring.Data
protected virtual IDbProvider GetTargetProvider()
{
string dbProviderName = (string)LogicalThreadContext.GetData(CURRENT_DBPROVIDER_SLOTNAME);
if (targetDbProviders.Contains(dbProviderName))
if (dbProviderName != null && targetDbProviders.Contains(dbProviderName))
{
return (IDbProvider)targetDbProviders[dbProviderName];
}
//Fall back to default if available
if (defaultDbProvider != null)
{
if (LOG.IsDebugEnabled)
{
LOG.Debug("No DbProvider defined in thread local storage, falling back to use DefaultDbProvider.");
}
return defaultDbProvider;
}
if (dbProviderName == null)
{
throw new InvalidDataAccessApiUsageException(
"No provider name found in thread local storage. Consider setting the property DefaultDbProvider to fallback to a default value.");
}
throw new InvalidDataAccessApiUsageException("'" + dbProviderName + "'"
+ "was not under the thread local key 'dbProviderName' and no default IDbProvider was set.");
+ " was not under the thread local key 'dbProviderName' and no default IDbProvider was set.");
}
/// <summary>

2
test/Spring/Spring.Data.Tests/Data/Common/DbProviderFactoryTests.cs
View File

@@ -20,11 +20,9 @@
using System;
using System.Globalization;
using System.Reflection;
using System.Threading;
using NUnit.Framework;
using Spring.Context;
using Spring.Core.IO;
using Spring.Threading;
using Spring.Util;

162
test/Spring/Spring.Data.Tests/Data/Common/MultiDelegatingDbProviderTests.cs Normal file
View File

@@ -0,0 +1,162 @@
#region License
/*
* Copyright 2002-2009 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.Collections;
using NUnit.Framework;
using Spring.Dao;
using Spring.Objects;
namespace Spring.Data.Common
{
/// <summary>
/// Test for MultiDelegatingDbProvider
/// </summary>
/// <author>Mark Pollack (.NET)</author>
[TestFixture]
public class MultiDelegatingDbProviderTests
{
[Test]
[ExpectedException(typeof(ArgumentException))]
public void CreationWhenNoRequiredPropertiesSet()
{
MultiDelegatingDbProvider dbProvider = new MultiDelegatingDbProvider();
dbProvider.AfterPropertiesSet();
}
[Test]
public void CreationWithWrongTypeDictionaryKeys()
{
try
{
MultiDelegatingDbProvider dbProvider = new MultiDelegatingDbProvider();
IDictionary targetDbProviders = new Hashtable();
targetDbProviders.Add(1, "bar");
dbProvider.TargetDbProviders = targetDbProviders;
dbProvider.AfterPropertiesSet();
Assert.Fail("Should have thrown ArgumentException");
} catch (ArgumentException ex)
{
Assert.AreEqual("Key identifying target IDbProvider in TargetDbProviders dictionary property is required to be of type string. Key = [1], type = [System.Int32]", ex.Message);
}
}
[Test]
public void CreationWithWrongTypeDictionaryValues()
{
try
{
MultiDelegatingDbProvider dbProvider = new MultiDelegatingDbProvider();
IDictionary targetDbProviders = new Hashtable();
targetDbProviders.Add("foo", 1);
dbProvider.TargetDbProviders = targetDbProviders;
dbProvider.AfterPropertiesSet();
Assert.Fail("Should have thrown ArgumentException");
}
catch (ArgumentException ex)
{
Assert.AreEqual("Value in TargetDbProviders dictionary is not of type IDbProvider. Type = [System.Int32]", ex.Message);
}
}
[Test]
public void NoDefaultProvided()
{
IDbProvider provider = DbProviderFactory.GetDbProvider("System.Data.SqlClient");
provider.ConnectionString = "connString1";
MultiDelegatingDbProvider multiDbProvider = new MultiDelegatingDbProvider();
IDictionary targetDbProviders = new Hashtable();
targetDbProviders.Add("db1", provider);
multiDbProvider.TargetDbProviders = targetDbProviders;
multiDbProvider.AfterPropertiesSet();
try
{
Assert.AreEqual("connString1", multiDbProvider.ConnectionString);
Assert.Fail("InvalidDataAccessApiUsageException should have been thrown");
} catch (InvalidDataAccessApiUsageException exception)
{
Assert.AreEqual("No provider name found in thread local storage. Consider setting the property DefaultDbProvider to fallback to a default value.", exception.Message);
}
}
[Test]
public void NoMatchingProviderDefinedInThreadLocalStorage()
{
IDbProvider provider = DbProviderFactory.GetDbProvider("System.Data.SqlClient");
provider.ConnectionString = "connString1";
MultiDelegatingDbProvider multiDbProvider = new MultiDelegatingDbProvider();
IDictionary targetDbProviders = new Hashtable();
targetDbProviders.Add("db1", provider);
multiDbProvider.TargetDbProviders = targetDbProviders;
multiDbProvider.AfterPropertiesSet();
try
{
MultiDelegatingDbProvider.CurrentDbProviderName = "db2";
Assert.AreEqual("connString1", multiDbProvider.ConnectionString);
Assert.Fail("InvalidDataAccessApiUsageException should have been thrown");
}
catch (InvalidDataAccessApiUsageException exception)
{
Assert.AreEqual("'db2' was not under the thread local key 'dbProviderName' and no default IDbProvider was set.", exception.Message);
}
}
[Test]
public void MatchingProviderDefinedInThreadLocalStorage()
{
IDbProvider provider1 = DbProviderFactory.GetDbProvider("System.Data.SqlClient");
provider1.ConnectionString = "connString1";
IDbProvider provider2 = DbProviderFactory.GetDbProvider("System.Data.SqlClient");
provider2.ConnectionString = "connString2";
MultiDelegatingDbProvider multiDbProvider = new MultiDelegatingDbProvider();
IDictionary targetDbProviders = new Hashtable();
targetDbProviders.Add("db1", provider1);
targetDbProviders.Add("db2", provider2);
multiDbProvider.DefaultDbProvider = provider1;
multiDbProvider.TargetDbProviders = targetDbProviders;
multiDbProvider.AfterPropertiesSet();
MultiDelegatingDbProvider.CurrentDbProviderName = "db2";
Assert.AreEqual("connString2", multiDbProvider.ConnectionString);
}
[Test]
public void FallbackToDefault()
{
IDbProvider provider1 = DbProviderFactory.GetDbProvider("System.Data.SqlClient");
provider1.ConnectionString = "connString1";
IDbProvider provider2 = DbProviderFactory.GetDbProvider("System.Data.SqlClient");
provider2.ConnectionString = "connString2";
MultiDelegatingDbProvider multiDbProvider = new MultiDelegatingDbProvider();
IDictionary targetDbProviders = new Hashtable();
targetDbProviders.Add("db1", provider1);
targetDbProviders.Add("db2", provider2);
multiDbProvider.DefaultDbProvider = provider1;
multiDbProvider.TargetDbProviders = targetDbProviders;
multiDbProvider.AfterPropertiesSet();
MultiDelegatingDbProvider.CurrentDbProviderName = "db314";
Assert.AreEqual("connString1", multiDbProvider.ConnectionString);
}
}
}

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

@@ -177,6 +177,7 @@
<Compile Include="Dao\Attributes\PersistenceExceptionTranslationPostProcessorTests.cs" />
<Compile Include="Dao\Support\DataAccessUtilsTests.cs" />
<Compile Include="Data\Common\DbParametersTests.cs" />
<Compile Include="Data\Common\MultiDelegatingDbProviderTests.cs" />
<Compile Include="Data\Common\UserCredentialsDbProviderTests.cs" />
<Compile Include="Data\Core\ServiceDomainTransactionManagerTests.cs" />
<Compile Include="Data\Core\TxScopeTransactionManagerIntegrationTests.cs" />