Skip to content

Commit

Permalink
Updated packages, NHibernate, and GreenPipes
Browse files Browse the repository at this point in the history
  • Loading branch information
@phatboyg
phatboyg committed May 11, 2018
1 parent 313ec1d commit 70a2076
Show file tree
Hide file tree
Showing 14 changed files with 146 additions and 215 deletions.
4 changes: 2 additions & 2 deletions build.fsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ open Fake.SemVerHelper
let buildArtifactPath = FullName "./build_artifacts"
let packagesPath = FullName "./src/packages"

let assemblyVersion = "4.0.0.0"
let baseVersion = "4.0.1"
let assemblyVersion = "4.1.0.0"
let baseVersion = "4.1.0"

let envVersion = (environVarOrDefault "APPVEYOR_BUILD_VERSION" (baseVersion + ".0"))
let buildVersion = (envVersion.Substring(0, envVersion.LastIndexOf('.')))
Expand Down
29 changes: 6 additions & 23 deletions ...omatonymous.NHibernateIntegration.Tests/Automatonymous.NHibernateIntegration.Tests.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net452</TargetFrameworks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<TargetFrameworks>net461</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="GreenPipes" Version="2.0.0" />
<PackageReference Include="Iesi.Collections" Version="4.0.1.4000" />
<PackageReference Include="GreenPipes" Version="2.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<PackageReference Include="NHibernate" Version="4.1.1.4000" />
<PackageReference Include="log4net" Version="2.0.8" />
<PackageReference Include="NUnit" Version="3.9.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
<PackageReference Include="NUnit" Version="3.10.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
<PackageReference Include="Iesi.Collections" Version="4.0.4" />
<PackageReference Include="NHibernate" Version="5.1.2" />
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Core" />
Expand Down
191 changes: 85 additions & 106 deletions src/Automatonymous.NHibernateIntegration.Tests/SingleConnectionSessionFactory.cs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,22 @@
namespace Automatonymous.NHibernateIntegration.Tests
// Copyright 2011-2018 Chris Patterson, Dru Sellers
//
// 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.
namespace Automatonymous.NHibernateIntegration.Tests
{
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.Common;
using System.Threading;
using System.Threading.Tasks;
using NHibernate;
using NHibernate.Engine;
using NHibernate.Metadata;
Expand All @@ -13,142 +27,107 @@ class SingleConnectionSessionFactory :
ISessionFactory
{
readonly ISessionFactory _inner;
readonly IDbConnection _liveConnection;
readonly DbConnection _liveConnection;

public SingleConnectionSessionFactory(ISessionFactory inner, IDbConnection liveConnection)
public SingleConnectionSessionFactory(ISessionFactory inner, DbConnection liveConnection)
{
_inner = inner;
_liveConnection = liveConnection;
}

public void Dispose()
{
_inner.Dispose();
}
public void Dispose() => _inner.Dispose();

public ISession OpenSession(IDbConnection conn)
{
return _inner.OpenSession(_liveConnection);
}
public ISession OpenSession(DbConnection conn) => _inner.WithOptions().Connection(_liveConnection).OpenSession();

public ISession OpenSession(IInterceptor sessionLocalInterceptor)
{
return _inner.OpenSession(_liveConnection, sessionLocalInterceptor);
}
public Task CloseAsync(CancellationToken cancellationToken = new CancellationToken()) =>
_inner.CloseAsync(cancellationToken);

public ISession OpenSession(IDbConnection conn, IInterceptor sessionLocalInterceptor)
{
return _inner.OpenSession(_liveConnection, sessionLocalInterceptor);
}
public Task EvictAsync(Type persistentClass, CancellationToken cancellationToken = new CancellationToken()) =>
_inner.EvictAsync(persistentClass, cancellationToken);

public ISession OpenSession()
{
return _inner.OpenSession(_liveConnection);
}
public Task EvictAsync(Type persistentClass, object id, CancellationToken cancellationToken = new CancellationToken()) =>
_inner.EvictAsync(persistentClass, id, cancellationToken);

public IClassMetadata GetClassMetadata(Type persistentClass)
{
return _inner.GetClassMetadata(persistentClass);
}
public Task EvictEntityAsync(string entityName, CancellationToken cancellationToken = new CancellationToken()) =>
_inner.EvictEntityAsync(entityName, cancellationToken);

public IClassMetadata GetClassMetadata(string entityName)
{
return _inner.GetClassMetadata(entityName);
}
public Task EvictEntityAsync(string entityName, object id, CancellationToken cancellationToken = new CancellationToken()) =>
_inner.EvictEntityAsync(entityName, id, cancellationToken);

public ICollectionMetadata GetCollectionMetadata(string roleName)
{
return _inner.GetCollectionMetadata(roleName);
}
public Task EvictCollectionAsync(string roleName, CancellationToken cancellationToken = new CancellationToken()) =>
_inner.EvictCollectionAsync(roleName, cancellationToken);

public IDictionary<string, IClassMetadata> GetAllClassMetadata()
{
return _inner.GetAllClassMetadata();
}
public Task EvictCollectionAsync(string roleName, object id, CancellationToken cancellationToken = new CancellationToken()) =>
_inner.EvictCollectionAsync(roleName, id, cancellationToken);

public IDictionary<string, ICollectionMetadata> GetAllCollectionMetadata()
{
return _inner.GetAllCollectionMetadata();
}
public Task EvictQueriesAsync(CancellationToken cancellationToken = new CancellationToken()) =>
_inner.EvictQueriesAsync(cancellationToken);

public void Close()
{
_inner.Close();
}
public Task EvictQueriesAsync(string cacheRegion, CancellationToken cancellationToken = new CancellationToken()) =>
_inner.EvictQueriesAsync(cacheRegion, cancellationToken);

public void Evict(Type persistentClass)
{
_inner.Evict(persistentClass);
}
public ISessionBuilder WithOptions() => _inner.WithOptions();

public void Evict(Type persistentClass, object id)
{
_inner.Evict(persistentClass, id);
}
public ISession OpenSession(IInterceptor sessionLocalInterceptor) =>
_inner.WithOptions().Connection(_liveConnection).Interceptor(sessionLocalInterceptor).OpenSession();

public void EvictEntity(string entityName)
{
_inner.EvictEntity(entityName);
}
public ISession OpenSession(DbConnection conn, IInterceptor sessionLocalInterceptor) =>
_inner.WithOptions().Connection(_liveConnection).Interceptor(sessionLocalInterceptor).OpenSession();

public void EvictEntity(string entityName, object id)
{
_inner.EvictEntity(entityName, id);
}
public ISession OpenSession() => _inner.WithOptions().Connection(_liveConnection).OpenSession();

public void EvictCollection(string roleName)
public IStatelessSessionBuilder WithStatelessOptions()
{
_inner.EvictCollection(roleName);
throw new NotImplementedException();
}

public void EvictCollection(string roleName, object id)
{
_inner.EvictCollection(roleName, id);
}
public IClassMetadata GetClassMetadata(Type persistentClass) =>
_inner.GetClassMetadata(persistentClass);

public void EvictQueries()
{
_inner.EvictQueries();
}
public IClassMetadata GetClassMetadata(string entityName) =>
_inner.GetClassMetadata(entityName);

public void EvictQueries(string cacheRegion)
{
_inner.EvictQueries(cacheRegion);
}
public ICollectionMetadata GetCollectionMetadata(string roleName) =>
_inner.GetCollectionMetadata(roleName);

public IStatelessSession OpenStatelessSession()
{
return _inner.OpenStatelessSession();
}
public IDictionary<string, IClassMetadata> GetAllClassMetadata() =>
_inner.GetAllClassMetadata();

public IStatelessSession OpenStatelessSession(IDbConnection connection)
{
return _inner.OpenStatelessSession(connection);
}
public IDictionary<string, ICollectionMetadata> GetAllCollectionMetadata() =>
_inner.GetAllCollectionMetadata();

public FilterDefinition GetFilterDefinition(string filterName)
{
return _inner.GetFilterDefinition(filterName);
}
public void Close() => _inner.Close();

public ISession GetCurrentSession()
{
return _inner.GetCurrentSession();
}
public void Evict(Type persistentClass) => _inner.Evict(persistentClass);

public IStatistics Statistics
{
get { return _inner.Statistics; }
}
public void Evict(Type persistentClass, object id) => _inner.Evict(persistentClass, id);

public bool IsClosed
{
get { return _inner.IsClosed; }
}
public void EvictEntity(string entityName) => _inner.EvictEntity(entityName);

public ICollection<string> DefinedFilterNames
{
get { return _inner.DefinedFilterNames; }
}
public void EvictEntity(string entityName, object id) => _inner.EvictEntity(entityName, id);

public void EvictCollection(string roleName) => _inner.EvictCollection(roleName);

public void EvictCollection(string roleName, object id) => _inner.EvictCollection(roleName, id);

public void EvictQueries() => _inner.EvictQueries();

public void EvictQueries(string cacheRegion) => _inner.EvictQueries(cacheRegion);

public IStatelessSession OpenStatelessSession() => _inner.OpenStatelessSession();

public IStatelessSession OpenStatelessSession(DbConnection connection) =>
_inner.OpenStatelessSession(connection);

public FilterDefinition GetFilterDefinition(string filterName) =>
_inner.GetFilterDefinition(filterName);

public ISession GetCurrentSession() => _inner.GetCurrentSession();

public IStatistics Statistics => _inner.Statistics;

public bool IsClosed => _inner.IsClosed;

public ICollection<string> DefinedFilterNames => _inner.DefinedFilterNames;
}
}
5 changes: 3 additions & 2 deletions src/Automatonymous.NHibernateIntegration.Tests/SqlLiteSessionFactoryProvider.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ namespace Automatonymous.NHibernateIntegration.Tests
{
using System;
using System.Data;
using System.Data.Common;
using System.Data.SQLite;
using NHibernate;
using NHibernate.Cache;
Expand Down Expand Up @@ -91,14 +92,14 @@ public override ISessionFactory GetSessionFactory()
BuildSchema(Configuration, _openConnection);

_innerSessionFactory = base.GetSessionFactory();
_innerSessionFactory.OpenSession(_openConnection);
_innerSessionFactory.WithOptions().Connection(_openConnection).OpenSession();

_sessionFactory = new SingleConnectionSessionFactory(_innerSessionFactory, _openConnection);

return _sessionFactory;
}

static void BuildSchema(Configuration config, IDbConnection connection)
static void BuildSchema(Configuration config, DbConnection connection)
{
new SchemaExport(config).Execute(true, true, false, connection, null);
}
Expand Down
25 changes: 4 additions & 21 deletions src/Automatonymous.NHibernateIntegration/Automatonymous.NHibernateIntegration.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,39 +4,22 @@
<AssemblyName>Automatonymous.NHibernateIntegration</AssemblyName>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>../../Automatonymous.snk</AssemblyOriginatorKeyFile>
<TargetFrameworks>net452</TargetFrameworks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<TargetFrameworks>net461</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>
<PackageId>Automatonymous.NHibernate</PackageId>
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\Automatonymous.NHibernateIntegration.xml</DocumentationFile>
<Description>Automatonymous, an open source state machine library, usable with MassTransit</Description>
<Version>3.5.11</Version>
<PackageProjectUrl>https://github.com/MassTransit/Automatonymous</PackageProjectUrl>
<PackageLicenseUrl>https://github.com/MassTransit/Automatonymous/blob/master/LICENSE</PackageLicenseUrl>
<RepositoryUrl>https://github.com/MassTransit/Automatonymous</RepositoryUrl>
<PackageTags>MassTransit</PackageTags>
<Authors>Chris Patterson</Authors>
<NoWarn>1701;1702;1705;1591;1712</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Iesi.Collections" Version="4.0.1.4000" />
<PackageReference Include="NHibernate" Version="4.1.1.4000" />
<PackageReference Include="Iesi.Collections" Version="4.0.4" />
<PackageReference Include="NHibernate" Version="5.1.2" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
Expand Down
13 changes: 7 additions & 6 deletions src/Automatonymous.NHibernateIntegration/UserTypes/AutomatonymousStateUserType.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2011-2013 Chris Patterson, Dru Sellers
// Copyright 2011-2018 Chris Patterson, Dru Sellers
//
// 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
Expand All @@ -13,7 +13,8 @@
namespace Automatonymous.UserTypes
{
using System;
using System.Data;
using System.Data.Common;
using NHibernate.Engine;
using NHibernate.SqlTypes;
using NHibernate.UserTypes;

Expand All @@ -39,18 +40,18 @@ public int GetHashCode(object x)
return ((State)x).Name.GetHashCode();
}

public object NullSafeGet(IDataReader rs, string[] names, object owner)
public object NullSafeGet(DbDataReader rs, string[] names, ISessionImplementor session, object owner)
{
StateUserTypeConverter converter = GetConverter();

return converter.Get(rs, names);
return converter.Get(rs, names, session);
}

public void NullSafeSet(IDbCommand cmd, object value, int index)
public void NullSafeSet(DbCommand cmd, object value, int index, ISessionImplementor session)
{
StateUserTypeConverter converter = GetConverter();

converter.Set(cmd, value, index);
converter.Set(cmd, value, index, session);
}

public object DeepCopy(object value)
Expand Down

0 comments on commit 70a2076

Please sign in to comment.