Skip to content

Commit ea4c208

Browse files
bahusoidbahusoid
committedMay 20, 2020
Fix CodeFactor issues
1 parent 9d37ca1 commit ea4c208

12 files changed

+128
-89
lines changed
 

‎src/NHibernate.Test/Async/MultiTenancy/DatabaseStrategyNoDbSpecificFixture.cs

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
using System.Runtime.Serialization.Formatters.Binary;
1717
using NHibernate.Cfg;
1818
using NHibernate.Cfg.MappingSchema;
19-
using NHibernate.Connection;
2019
using NHibernate.Dialect;
2120
using NHibernate.Driver;
2221
using NHibernate.Engine;

‎src/NHibernate.Test/MultiTenancy/DatabaseStrategyNoDbSpecificFixture.cs

-48
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using System.Runtime.Serialization.Formatters.Binary;
77
using NHibernate.Cfg;
88
using NHibernate.Cfg.MappingSchema;
9-
using NHibernate.Connection;
109
using NHibernate.Dialect;
1110
using NHibernate.Driver;
1211
using NHibernate.Engine;
@@ -346,51 +345,4 @@ protected override void OnSetUp()
346345

347346
#endregion Test Setup
348347
}
349-
350-
[Serializable]
351-
class Entity
352-
{
353-
public virtual Guid Id { get; set; }
354-
public virtual string Name { get; set; }
355-
}
356-
357-
public class MockConnectionProvider : IMultiTenantConnectionProvider
358-
{
359-
private readonly IConnectionAccess _connectionAccess;
360-
361-
public MockConnectionProvider(string tenantIdentifier, IConnectionAccess connectionAccess)
362-
{
363-
_connectionAccess = connectionAccess;
364-
TenantIdentifier = tenantIdentifier;
365-
}
366-
367-
public string TenantIdentifier { get; }
368-
public IConnectionAccess GetConnectionAccess()
369-
{
370-
return _connectionAccess;
371-
}
372-
}
373-
374-
[Serializable]
375-
public class TestTenantConnectionProvider : AbstractMultiTenantConnectionProvider
376-
{
377-
public TestTenantConnectionProvider(ISessionFactoryImplementor sfi, string tenantId, bool isSqlServerDialect)
378-
{
379-
TenantIdentifier = tenantId;
380-
SessionFactory = sfi;
381-
TenantConnectionString = sfi.ConnectionProvider.GetConnectionString();
382-
if (isSqlServerDialect)
383-
{
384-
var stringBuilder = new SqlConnectionStringBuilder(sfi.ConnectionProvider.GetConnectionString());
385-
stringBuilder.ApplicationName = tenantId;
386-
TenantConnectionString = stringBuilder.ToString();
387-
}
388-
}
389-
390-
protected override string TenantConnectionString { get; }
391-
392-
public override string TenantIdentifier { get; }
393-
394-
protected override ISessionFactoryImplementor SessionFactory { get; }
395-
}
396348
}

‎src/NHibernate.Test/MultiTenancy/Entity.cs

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
using System;
2+
3+
namespace NHibernate.Test.MultiTenancy
4+
{
5+
[Serializable]
6+
class Entity
7+
{
8+
public virtual Guid Id { get; set; }
9+
public virtual string Name { get; set; }
10+
}
11+
}

‎src/NHibernate.Test/MultiTenancy/MockConnectionProvider.cs

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
using NHibernate.Connection;
2+
using NHibernate.MultiTenancy;
3+
4+
namespace NHibernate.Test.MultiTenancy
5+
{
6+
public class MockConnectionProvider : IMultiTenantConnectionProvider
7+
{
8+
private readonly IConnectionAccess _connectionAccess;
9+
10+
public MockConnectionProvider(string tenantIdentifier, IConnectionAccess connectionAccess)
11+
{
12+
_connectionAccess = connectionAccess;
13+
TenantIdentifier = tenantIdentifier;
14+
}
15+
16+
public string TenantIdentifier { get; }
17+
public IConnectionAccess GetConnectionAccess()
18+
{
19+
return _connectionAccess;
20+
}
21+
}
22+
}

‎src/NHibernate.Test/MultiTenancy/TestTenantConnectionProvider.cs

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
using System;
2+
using System.Data.SqlClient;
3+
using NHibernate.Connection;
4+
using NHibernate.Engine;
5+
using NHibernate.MultiTenancy;
6+
7+
namespace NHibernate.Test.MultiTenancy
8+
{
9+
[Serializable]
10+
public class TestTenantConnectionProvider : AbstractMultiTenantConnectionProvider
11+
{
12+
public TestTenantConnectionProvider(ISessionFactoryImplementor sfi, string tenantId, bool isSqlServerDialect)
13+
{
14+
TenantIdentifier = tenantId;
15+
SessionFactory = sfi;
16+
TenantConnectionString = sfi.ConnectionProvider.GetConnectionString();
17+
if (isSqlServerDialect)
18+
{
19+
var stringBuilder = new SqlConnectionStringBuilder(sfi.ConnectionProvider.GetConnectionString());
20+
stringBuilder.ApplicationName = tenantId;
21+
TenantConnectionString = stringBuilder.ToString();
22+
}
23+
}
24+
25+
protected override string TenantConnectionString { get; }
26+
27+
public override string TenantIdentifier { get; }
28+
29+
protected override ISessionFactoryImplementor SessionFactory { get; }
30+
}
31+
}

‎src/NHibernate/AdoNet/ConnectionManager.cs

-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ public ConnectionManager(
8484
#pragma warning disable 618
8585
: this(session, suppliedConnection, connectionReleaseMode, interceptor, shouldAutoJoinTransaction)
8686
#pragma warning restore 618
87-
8887
{
8988
_connectionAccess = connectionAccess ?? throw new ArgumentNullException(nameof(connectionAccess));
9089
}

‎src/NHibernate/Async/Impl/AbstractSessionImpl.cs

-13
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
using NHibernate.AdoNet;
1818
using NHibernate.Cache;
1919
using NHibernate.Collection;
20-
using NHibernate.Connection;
2120
using NHibernate.Engine;
2221
using NHibernate.Engine.Query;
2322
using NHibernate.Engine.Query.Sql;
@@ -220,16 +219,4 @@ protected async Task AfterOperationAsync(bool success, CancellationToken cancell
220219

221220
public abstract Task<int> ExecuteUpdateAsync(IQueryExpression queryExpression, QueryParameters queryParameters, CancellationToken cancellationToken);
222221
}
223-
partial class NonContextualConnectionAccess : IConnectionAccess
224-
{
225-
226-
public Task<DbConnection> GetConnectionAsync(CancellationToken cancellationToken)
227-
{
228-
if (cancellationToken.IsCancellationRequested)
229-
{
230-
return Task.FromCanceled<DbConnection>(cancellationToken);
231-
}
232-
return _factory.ConnectionProvider.GetConnectionAsync(cancellationToken);
233-
}
234-
}
235222
}

‎src/NHibernate/Async/Impl/NonContextualConnectionAccess.cs

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
//------------------------------------------------------------------------------
2+
// <auto-generated>
3+
// This code was generated by AsyncGenerator.
4+
//
5+
// Changes to this file may cause incorrect behavior and will be lost if
6+
// the code is regenerated.
7+
// </auto-generated>
8+
//------------------------------------------------------------------------------
9+
10+
11+
using System;
12+
using System.Data.Common;
13+
using NHibernate.Connection;
14+
using NHibernate.Engine;
15+
16+
namespace NHibernate.Impl
17+
{
18+
using System.Threading.Tasks;
19+
using System.Threading;
20+
partial class NonContextualConnectionAccess : IConnectionAccess
21+
{
22+
23+
public Task<DbConnection> GetConnectionAsync(CancellationToken cancellationToken)
24+
{
25+
if (cancellationToken.IsCancellationRequested)
26+
{
27+
return Task.FromCanceled<DbConnection>(cancellationToken);
28+
}
29+
return _factory.ConnectionProvider.GetConnectionAsync(cancellationToken);
30+
}
31+
}
32+
}

‎src/NHibernate/Cache/CacheKey.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ private int GenerateHashCode()
9090

9191
if (_tenantIdentifier != null)
9292
{
93-
hashCode = 37 * hashCode + _tenantIdentifier.GetHashCode();
93+
hashCode = (37 * hashCode) + _tenantIdentifier.GetHashCode();
9494
}
9595

9696
return hashCode;

‎src/NHibernate/Cache/QueryKey.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ public int ComputeHashCode()
258258
result = 37 * result + _sqlQueryString.GetHashCode();
259259
if (_tenantIdentifier != null)
260260
{
261-
result = 37 * result + _tenantIdentifier.GetHashCode();
261+
result = (37 * result) + _tenantIdentifier.GetHashCode();
262262
}
263263
return result;
264264
}

‎src/NHibernate/Impl/AbstractSessionImpl.cs

-24
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using NHibernate.AdoNet;
88
using NHibernate.Cache;
99
using NHibernate.Collection;
10-
using NHibernate.Connection;
1110
using NHibernate.Engine;
1211
using NHibernate.Engine.Query;
1312
using NHibernate.Engine.Query.Sql;
@@ -703,27 +702,4 @@ public virtual IQueryBatch CreateQueryBatch()
703702
return new QueryBatch(this, false);
704703
}
705704
}
706-
707-
[Serializable]
708-
partial class NonContextualConnectionAccess : IConnectionAccess
709-
{
710-
private readonly ISessionFactoryImplementor _factory;
711-
712-
public NonContextualConnectionAccess(ISessionFactoryImplementor factory)
713-
{
714-
_factory = factory;
715-
}
716-
717-
public DbConnection GetConnection()
718-
{
719-
return _factory.ConnectionProvider.GetConnection();
720-
}
721-
722-
public void CloseConnection(DbConnection connection)
723-
{
724-
_factory.ConnectionProvider.CloseConnection(connection);
725-
}
726-
727-
public string ConnectionString => _factory.ConnectionProvider.GetConnectionString();
728-
}
729705
}

‎src/NHibernate/Impl/NonContextualConnectionAccess.cs

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
using System;
2+
using System.Data.Common;
3+
using NHibernate.Connection;
4+
using NHibernate.Engine;
5+
6+
namespace NHibernate.Impl
7+
{
8+
[Serializable]
9+
partial class NonContextualConnectionAccess : IConnectionAccess
10+
{
11+
private readonly ISessionFactoryImplementor _factory;
12+
13+
public NonContextualConnectionAccess(ISessionFactoryImplementor factory)
14+
{
15+
_factory = factory;
16+
}
17+
18+
public DbConnection GetConnection()
19+
{
20+
return _factory.ConnectionProvider.GetConnection();
21+
}
22+
23+
public void CloseConnection(DbConnection connection)
24+
{
25+
_factory.ConnectionProvider.CloseConnection(connection);
26+
}
27+
28+
public string ConnectionString => _factory.ConnectionProvider.GetConnectionString();
29+
}
30+
}

0 commit comments

Comments
 (0)