Merge pull request #105 from peetw/update-nhibernate

peetw · web-flow · commit 1a55b317684d · 2019-03-06T19:44:41.000Z
Update NHibernate dependency
diff --git a/NHibernate.Spatial.MsSql/Type/SqlGeographyType.cs b/NHibernate.Spatial.MsSql/Type/SqlGeographyType.cs
@@ -50,6 +50,7 @@ public override object Get(DbDataReader rs, string name, ISessionImplementor ses
             return Get(rs, rs.GetOrdinal(name), session);
         }
 
+        [Obsolete("This method has no more usages and will be removed in a future version. Override ToLoggableString instead.")]
         public override string ToString(object value)
         {
             return value.ToString();
@@ -65,6 +66,7 @@ public override object Get(DbDataReader rs, int index, ISessionImplementor sessi
             return (SqlGeography)rs[index];
         }
 
+        [Obsolete("This method has no more usages and will be removed in a future version.")]
         public override object FromStringValue(string xml)
         {
             return SqlGeography.STGeomFromText(new SqlChars(xml), 0);
diff --git a/NHibernate.Spatial.MsSql/Type/SqlGeometryType.cs b/NHibernate.Spatial.MsSql/Type/SqlGeometryType.cs
@@ -50,6 +50,7 @@ public override object Get(DbDataReader rs, string name, ISessionImplementor ses
             return Get(rs, rs.GetOrdinal(name), session);
         }
 
+        [Obsolete("This method has no more usages and will be removed in a future version. Override ToLoggableString instead.")]
         public override string ToString(object value)
         {
             return value.ToString();
@@ -65,6 +66,7 @@ public override object Get(DbDataReader rs, int index, ISessionImplementor sessi
             return (SqlGeometry)rs[index];
         }
 
+        [Obsolete("This method has no more usages and will be removed in a future version.")]
         public override object FromStringValue(string xml)
         {
             return SqlGeometry.STGeomFromText(new SqlChars(xml), 0);
diff --git a/NHibernate.Spatial.MySQL/Type/MySQL57GeometryAdapterType.cs b/NHibernate.Spatial.MySQL/Type/MySQL57GeometryAdapterType.cs
@@ -48,7 +48,8 @@ public override object Get(DbDataReader rs, string name, ISessionImplementor ses
 			return Get(rs, rs.GetOrdinal(name), session);
 		}
 
-		public override string ToString(object value)
+		[Obsolete("This method has no more usages and will be removed in a future version. Override ToLoggableString instead.")]
+        public override string ToString(object value)
 		{
 			return value.ToString();
 		}
@@ -63,7 +64,8 @@ public override object Get(DbDataReader rs, int index, ISessionImplementor sessi
 			return new MySqlGeometry(MySqlDbType.Geometry, (byte[])rs[index]);
 		}
 
-		public override object FromStringValue(string xml)
+		[Obsolete("This method has no more usages and will be removed in a future version.")]
+        public override object FromStringValue(string xml)
 		{
 			return MySqlGeometry.Parse(xml);
 		}
diff --git a/NHibernate.Spatial.MySQL/Type/MySQLGeometryStringType.cs b/NHibernate.Spatial.MySQL/Type/MySQLGeometryStringType.cs
@@ -117,11 +117,13 @@ public object StringToObject(string xml)
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
+        [Obsolete("This method has no more usages and will be removed in a future version. Override ToLoggableString instead.")]
         public override string ToString(object value)
         {
             return (string)value;
         }
 
+        [Obsolete("This method has no more usages and will be removed in a future version.")]
         public override object FromStringValue(string xml)
         {
             return xml;
diff --git a/NHibernate.Spatial.PostGis/Type/PostGisGeometryType.cs b/NHibernate.Spatial.PostGis/Type/PostGisGeometryType.cs
@@ -165,11 +165,13 @@ public override object Get(DbDataReader rs, string name, ISessionImplementor ses
                 return Get(rs, rs.GetOrdinal(name), session);
             }
 
+            [Obsolete("This method has no more usages and will be removed in a future version. Override ToLoggableString instead.")]
             public override string ToString(object val)
             {
                 return PostGisGeometryType.ToString((byte[])val);
             }
 
+            [Obsolete("This method has no more usages and will be removed in a future version.")]
             public override object FromStringValue(string xml)
             {
                 return ToByteArray(xml);
diff --git a/NHibernate.Spatial/NHibernate.Spatial.csproj b/NHibernate.Spatial/NHibernate.Spatial.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="NetTopologySuite" Version="1.15.1" />
-    <PackageReference Include="NHibernate" Version="[5.1, 5.2)" />
+    <PackageReference Include="NHibernate" Version="5.2.4" />
   </ItemGroup>
 
 </Project>
diff --git a/Tests.NHibernate.Spatial.MsSql2008/TestConfiguration.cs b/Tests.NHibernate.Spatial.MsSql2008/TestConfiguration.cs
@@ -1,22 +1,23 @@
+using NHibernate.Bytecode;
 using NHibernate.Cfg;
 using NHibernate.Driver;
 using NHibernate.Spatial.Dialect;
 using System.Collections.Generic;
-using Environment = NHibernate.Cfg.Environment;
-using NHibernateFactory = NHibernate.Bytecode.DefaultProxyFactoryFactory;
 
 namespace Tests.NHibernate.Spatial
 {
     internal static class TestConfiguration
     {
         public static void Configure(Configuration configuration)
         {
-            IDictionary<string, string> properties = new Dictionary<string, string>();
-            properties[Environment.ProxyFactoryFactoryClass] = typeof(NHibernateFactory).AssemblyQualifiedName;
-            properties[Environment.Dialect] = typeof(MsSql2008GeometryDialect).AssemblyQualifiedName;
-            properties[Environment.ConnectionProvider] = typeof(DebugConnectionProvider).AssemblyQualifiedName;
-            properties[Environment.ConnectionDriver] = typeof(SqlClientDriver).AssemblyQualifiedName;
-            properties[Environment.ConnectionString] = System.Configuration.ConfigurationManager.ConnectionStrings["SqlServer2008"].ConnectionString;
+            IDictionary<string, string> properties = new Dictionary<string, string>
+            {
+                [Environment.ProxyFactoryFactoryClass] = typeof(StaticProxyFactoryFactory).AssemblyQualifiedName,
+                [Environment.Dialect] = typeof(MsSql2008GeometryDialect).AssemblyQualifiedName,
+                [Environment.ConnectionProvider] = typeof(DebugConnectionProvider).AssemblyQualifiedName,
+                [Environment.ConnectionDriver] = typeof(SqlClientDriver).AssemblyQualifiedName,
+                [Environment.ConnectionString] = System.Configuration.ConfigurationManager.ConnectionStrings["SqlServer2008"].ConnectionString
+            };
             configuration.SetProperties(properties);
         }
     }
diff --git a/Tests.NHibernate.Spatial.MsSql2012/TestConfiguration.cs b/Tests.NHibernate.Spatial.MsSql2012/TestConfiguration.cs
@@ -1,22 +1,23 @@
+using NHibernate.Bytecode;
 using NHibernate.Cfg;
 using NHibernate.Driver;
 using NHibernate.Spatial.Dialect;
 using System.Collections.Generic;
-using Environment = NHibernate.Cfg.Environment;
-using NHibernateFactory = NHibernate.Bytecode.DefaultProxyFactoryFactory;
 
 namespace Tests.NHibernate.Spatial
 {
     internal static class TestConfiguration
     {
         public static void Configure(Configuration configuration)
         {
-            IDictionary<string, string> properties = new Dictionary<string, string>();
-            properties[Environment.ProxyFactoryFactoryClass] = typeof(NHibernateFactory).AssemblyQualifiedName;
-            properties[Environment.Dialect] = typeof(MsSql2012GeometryDialect).AssemblyQualifiedName;
-            properties[Environment.ConnectionProvider] = typeof(DebugConnectionProvider).AssemblyQualifiedName;
-            properties[Environment.ConnectionDriver] = typeof(SqlClientDriver).AssemblyQualifiedName;
-            properties[Environment.ConnectionString] = System.Configuration.ConfigurationManager.ConnectionStrings["SqlServer2012"].ConnectionString;
+            IDictionary<string, string> properties = new Dictionary<string, string>
+            {
+                [Environment.ProxyFactoryFactoryClass] = typeof(StaticProxyFactoryFactory).AssemblyQualifiedName,
+                [Environment.Dialect] = typeof(MsSql2012GeometryDialect).AssemblyQualifiedName,
+                [Environment.ConnectionProvider] = typeof(DebugConnectionProvider).AssemblyQualifiedName,
+                [Environment.ConnectionDriver] = typeof(SqlClientDriver).AssemblyQualifiedName,
+                [Environment.ConnectionString] = System.Configuration.ConfigurationManager.ConnectionStrings["SqlServer2012"].ConnectionString
+            };
             configuration.SetProperties(properties);
         }
     }
diff --git a/Tests.NHibernate.Spatial.MySQL/TestConfiguration.cs b/Tests.NHibernate.Spatial.MySQL/TestConfiguration.cs
@@ -1,10 +1,9 @@
 using Microsoft.Extensions.Configuration;
+using NHibernate.Bytecode;
 using NHibernate.Cfg;
 using NHibernate.Driver;
 using NHibernate.Spatial.Dialect;
 using System.Collections.Generic;
-using Environment = NHibernate.Cfg.Environment;
-using NHibernateFactory = NHibernate.Bytecode.DefaultProxyFactoryFactory;
 
 namespace Tests.NHibernate.Spatial
 {
@@ -21,12 +20,14 @@ static TestConfiguration()
 
         public static void Configure(Configuration configuration)
         {
-            IDictionary<string, string> properties = new Dictionary<string, string>();
-            properties[Environment.ProxyFactoryFactoryClass] = typeof(NHibernateFactory).AssemblyQualifiedName;
-            properties[Environment.Dialect] = typeof(MySQLSpatialDialect).AssemblyQualifiedName;
-            properties[Environment.ConnectionProvider] = typeof(DebugConnectionProvider).AssemblyQualifiedName;
-            properties[Environment.ConnectionDriver] = typeof(MySqlDataDriver).AssemblyQualifiedName;
-            properties[Environment.ConnectionString] = _configurationRoot.GetConnectionString("MySQL");
+            IDictionary<string, string> properties = new Dictionary<string, string>
+            {
+                [Environment.ProxyFactoryFactoryClass] = typeof(StaticProxyFactoryFactory).AssemblyQualifiedName,
+                [Environment.Dialect] = typeof(MySQLSpatialDialect).AssemblyQualifiedName,
+                [Environment.ConnectionProvider] = typeof(DebugConnectionProvider).AssemblyQualifiedName,
+                [Environment.ConnectionDriver] = typeof(MySqlDataDriver).AssemblyQualifiedName,
+                [Environment.ConnectionString] = _configurationRoot.GetConnectionString("MySQL")
+            };
             configuration.SetProperties(properties);
         }
     }
diff --git a/Tests.NHibernate.Spatial.MySQL57/TestConfiguration.cs b/Tests.NHibernate.Spatial.MySQL57/TestConfiguration.cs
@@ -1,10 +1,9 @@
 using Microsoft.Extensions.Configuration;
+using NHibernate.Bytecode;
 using NHibernate.Cfg;
 using NHibernate.Driver;
 using NHibernate.Spatial.Dialect;
 using System.Collections.Generic;
-using Environment = NHibernate.Cfg.Environment;
-using NHibernateFactory = NHibernate.Bytecode.DefaultProxyFactoryFactory;
 
 namespace Tests.NHibernate.Spatial
 {
@@ -21,12 +20,14 @@ static TestConfiguration()
 
         public static void Configure(Configuration configuration)
         {
-            IDictionary<string, string> properties = new Dictionary<string, string>();
-            properties[Environment.ProxyFactoryFactoryClass] = typeof(NHibernateFactory).AssemblyQualifiedName;
-            properties[Environment.Dialect] = typeof(MySQL57SpatialDialect).AssemblyQualifiedName;
-            properties[Environment.ConnectionProvider] = typeof(DebugConnectionProvider).AssemblyQualifiedName;
-            properties[Environment.ConnectionDriver] = typeof(MySqlDataDriver).AssemblyQualifiedName;
-            properties[Environment.ConnectionString] = _configurationRoot.GetConnectionString("MySQL57");
+            IDictionary<string, string> properties = new Dictionary<string, string>
+            {
+                [Environment.ProxyFactoryFactoryClass] = typeof(StaticProxyFactoryFactory).AssemblyQualifiedName,
+                [Environment.Dialect] = typeof(MySQL57SpatialDialect).AssemblyQualifiedName,
+                [Environment.ConnectionProvider] = typeof(DebugConnectionProvider).AssemblyQualifiedName,
+                [Environment.ConnectionDriver] = typeof(MySqlDataDriver).AssemblyQualifiedName,
+                [Environment.ConnectionString] = _configurationRoot.GetConnectionString("MySQL57")
+            };
             configuration.SetProperties(properties);
         }
     }
diff --git a/Tests.NHibernate.Spatial.PostGis/TestConfiguration.cs b/Tests.NHibernate.Spatial.PostGis/TestConfiguration.cs
@@ -1,10 +1,9 @@
 using Microsoft.Extensions.Configuration;
+using NHibernate.Bytecode;
 using NHibernate.Cfg;
 using NHibernate.Driver;
 using NHibernate.Spatial.Dialect;
 using System.Collections.Generic;
-using Environment = NHibernate.Cfg.Environment;
-using NHibernateFactory = NHibernate.Bytecode.DefaultProxyFactoryFactory;
 
 namespace Tests.NHibernate.Spatial
 {
@@ -21,12 +20,14 @@ static TestConfiguration()
 
         public static void Configure(Configuration configuration)
         {
-            IDictionary<string, string> properties = new Dictionary<string, string>();
-            properties[Environment.ProxyFactoryFactoryClass] = typeof(NHibernateFactory).AssemblyQualifiedName;
-            properties[Environment.Dialect] = typeof(PostGisDialect).AssemblyQualifiedName;
-            properties[Environment.ConnectionProvider] = typeof(DebugConnectionProvider).AssemblyQualifiedName;
-            properties[Environment.ConnectionDriver] = typeof(NpgsqlDriver).AssemblyQualifiedName;
-            properties[Environment.ConnectionString] = _configurationRoot.GetConnectionString("PostGis");
+            IDictionary<string, string> properties = new Dictionary<string, string>
+            {
+                [Environment.ProxyFactoryFactoryClass] = typeof(StaticProxyFactoryFactory).AssemblyQualifiedName,
+                [Environment.Dialect] = typeof(PostGisDialect).AssemblyQualifiedName,
+                [Environment.ConnectionProvider] = typeof(DebugConnectionProvider).AssemblyQualifiedName,
+                [Environment.ConnectionDriver] = typeof(NpgsqlDriver).AssemblyQualifiedName,
+                [Environment.ConnectionString] = _configurationRoot.GetConnectionString("PostGis")
+            };
             configuration.SetProperties(properties);
         }
     }
diff --git a/Tests.NHibernate.Spatial.PostGis20/TestConfiguration.cs b/Tests.NHibernate.Spatial.PostGis20/TestConfiguration.cs
@@ -1,10 +1,9 @@
 using Microsoft.Extensions.Configuration;
+using NHibernate.Bytecode;
 using NHibernate.Cfg;
 using NHibernate.Driver;
 using NHibernate.Spatial.Dialect;
 using System.Collections.Generic;
-using Environment = NHibernate.Cfg.Environment;
-using NHibernateFactory = NHibernate.Bytecode.DefaultProxyFactoryFactory;
 
 namespace Tests.NHibernate.Spatial
 {
@@ -21,12 +20,14 @@ static TestConfiguration()
 
         public static void Configure(Configuration configuration)
         {
-            IDictionary<string, string> properties = new Dictionary<string, string>();
-            properties[Environment.ProxyFactoryFactoryClass] = typeof(NHibernateFactory).AssemblyQualifiedName;
-            properties[Environment.Dialect] = typeof(PostGis20Dialect).AssemblyQualifiedName;
-            properties[Environment.ConnectionProvider] = typeof(DebugConnectionProvider).AssemblyQualifiedName;
-            properties[Environment.ConnectionDriver] = typeof(NpgsqlDriver).AssemblyQualifiedName;
-            properties[Environment.ConnectionString] = _configurationRoot.GetConnectionString("PostGis20");
+            IDictionary<string, string> properties = new Dictionary<string, string>
+            {
+                [Environment.ProxyFactoryFactoryClass] = typeof(StaticProxyFactoryFactory).AssemblyQualifiedName,
+                [Environment.Dialect] = typeof(PostGis20Dialect).AssemblyQualifiedName,
+                [Environment.ConnectionProvider] = typeof(DebugConnectionProvider).AssemblyQualifiedName,
+                [Environment.ConnectionDriver] = typeof(NpgsqlDriver).AssemblyQualifiedName,
+                [Environment.ConnectionString] = _configurationRoot.GetConnectionString("PostGis20")
+            };
             configuration.SetProperties(properties);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ public override object Get(DbDataReader rs, string name, ISessionImplementor ses`
`50`	`50`	`return Get(rs, rs.GetOrdinal(name), session);`
`51`	`51`	`}`
`52`	`52`
	`53`	`+ [Obsolete("This method has no more usages and will be removed in a future version. Override ToLoggableString instead.")]`
`53`	`54`	`public override string ToString(object value)`
`54`	`55`	`{`
`55`	`56`	`return value.ToString();`
`@@ -65,6 +66,7 @@ public override object Get(DbDataReader rs, int index, ISessionImplementor sessi`
`65`	`66`	`return (SqlGeography)rs[index];`
`66`	`67`	`}`
`67`	`68`
	`69`	`+ [Obsolete("This method has no more usages and will be removed in a future version.")]`
`68`	`70`	`public override object FromStringValue(string xml)`
`69`	`71`	`{`
`70`	`72`	`return SqlGeography.STGeomFromText(new SqlChars(xml), 0);`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,8 @@ public override object Get(DbDataReader rs, string name, ISessionImplementor ses`
`48`	`48`	`return Get(rs, rs.GetOrdinal(name), session);`
`49`	`49`	`}`
`50`	`50`
`51`		`- public override string ToString(object value)`
	`51`	`+ [Obsolete("This method has no more usages and will be removed in a future version. Override ToLoggableString instead.")]`
	`52`	`+ public override string ToString(object value)`
`52`	`53`	`{`
`53`	`54`	`return value.ToString();`
`54`	`55`	`}`
`@@ -63,7 +64,8 @@ public override object Get(DbDataReader rs, int index, ISessionImplementor sessi`
`63`	`64`	`return new MySqlGeometry(MySqlDbType.Geometry, (byte[])rs[index]);`
`64`	`65`	`}`
`65`	`66`
`66`		`- public override object FromStringValue(string xml)`
	`67`	`+ [Obsolete("This method has no more usages and will be removed in a future version.")]`
	`68`	`+ public override object FromStringValue(string xml)`
`67`	`69`	`{`
`68`	`70`	`return MySqlGeometry.Parse(xml);`
`69`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,11 +117,13 @@ public object StringToObject(string xml)`
`117`	`117`	`/// </summary>`
`118`	`118`	`/// <param name="value"></param>`
`119`	`119`	`/// <returns></returns>`
	`120`	`+ [Obsolete("This method has no more usages and will be removed in a future version. Override ToLoggableString instead.")]`
`120`	`121`	`public override string ToString(object value)`
`121`	`122`	`{`
`122`	`123`	`return (string)value;`
`123`	`124`	`}`
`124`	`125`
	`126`	`+ [Obsolete("This method has no more usages and will be removed in a future version.")]`
`125`	`127`	`public override object FromStringValue(string xml)`
`126`	`128`	`{`
`127`	`129`	`return xml;`
Original file line number	Diff line number	Diff line change
`@@ -165,11 +165,13 @@ public override object Get(DbDataReader rs, string name, ISessionImplementor ses`
`165`	`165`	`return Get(rs, rs.GetOrdinal(name), session);`
`166`	`166`	`}`
`167`	`167`
	`168`	`+ [Obsolete("This method has no more usages and will be removed in a future version. Override ToLoggableString instead.")]`
`168`	`169`	`public override string ToString(object val)`
`169`	`170`	`{`
`170`	`171`	`return PostGisGeometryType.ToString((byte[])val);`
`171`	`172`	`}`
`172`	`173`
	`174`	`+ [Obsolete("This method has no more usages and will be removed in a future version.")]`
`173`	`175`	`public override object FromStringValue(string xml)`
`174`	`176`	`{`
`175`	`177`	`return ToByteArray(xml);`