Obsolete NullableType.Get by column name

src/NHibernate.DomainModel/NHSpecific/NullableTypesType.cs

@@ -30,11 +30,6 @@ public override object NullSafeGet(DbDataReader rs, string name, ISessionImpleme
 			}
 		}
 
-		public override object Get(DbDataReader rs, string name, ISessionImplementor session)
-		{
-			return Get(rs, rs.GetOrdinal(name), session);
-		}
-
 		public override string Name
 		{
 			get { return ReturnedClass.Name; }

src/NHibernate.Test/Async/TypesTest/BooleanTypeFixture.cs

@@ -8,6 +8,7 @@
 //------------------------------------------------------------------------------
 
 
+using System;
 using System.Data.Common;
 using NHibernate.Engine;
 using NHibernate.Type;

src/NHibernate.Test/Async/TypesTest/GuidTypeFixture.cs

@@ -83,4 +83,4 @@ public async Task GuidInWhereClauseAsync()
 			}
 		}
 	}
-}
+}

src/NHibernate.Test/TypesTest/BooleanTypeFixture.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Data.Common;
 using NHibernate.Engine;
 using NHibernate.Type;
@@ -69,21 +70,24 @@ public void GetByIndex(bool expected)
 		}
 
 		[Theory]
+		[Obsolete("Testing obsolete API")]
 		public void GetByName(bool expected)
 		{
 			const string name0 = "name0";
 			const string name1 = "name1";
-			BooleanType type = NHibernateUtil.Boolean;
+			var type = NHibernateUtil.Boolean;
 			var session = Substitute.For<ISessionImplementor>();
 			var reader = Substitute.For<DbDataReader>();
-			reader[name0].Returns(expected);
-			reader[name1].Returns(expected);
+			reader.GetOrdinal(name0).Returns(0);
+			reader.GetOrdinal(name1).Returns(1);
+			reader[0].Returns(expected);
+			reader[1].Returns(expected);
 
 			var result0 = type.Get(reader, name0, session);
 			var result1 = type.Get(reader, name1, session);
 
-			Assert.AreEqual(expected, (bool) result0);
-			Assert.AreSame(result0, result1);
+			Assert.That((bool) result0, Is.EqualTo(expected));
+			Assert.That(result1, Is.SameAs(result0));
 		}
 
 		[Test]

src/NHibernate.Test/TypesTest/CharBooleanTypeFixture.cs

@@ -1,4 +1,5 @@
-using System.Data.Common;
+using System;
+using System.Data.Common;
 using NHibernate.Engine;
 using NHibernate.SqlTypes;
 using NHibernate.Type;
@@ -29,6 +30,7 @@ public void GetByIndex(bool expected)
 		}
 
 		[Theory]
+		[Obsolete("Testing obsolete API")]
 		public void GetByName(bool value)
 		{
 			const string name = "0";
@@ -42,7 +44,7 @@ public void GetByName(bool value)
 
 			var result = type.Get(reader, name, session);
 
-			Assert.AreSame(expected, result);
+			Assert.That(result, Is.SameAs(expected));
 		}
 
 		[Theory]

src/NHibernate.Test/TypesTest/GuidTypeFixture.cs

@@ -93,7 +93,7 @@ public void GuidInWhereClause()
 		[Test]
 		public void GetGuidWorksWhenUnderlyingTypeIsRepresentedByString()
 		{
-			GuidType type = (GuidType)NHibernateUtil.Guid;
+			var type = NHibernateUtil.Guid;
 
 			Guid value = Guid.NewGuid();
 			DataTable data = new DataTable("test");
@@ -106,14 +106,15 @@ public void GetGuidWorksWhenUnderlyingTypeIsRepresentedByString()
 			var reader = data.CreateDataReader();
 			reader.Read();
 
-			using (var s = OpenSession())
-			{
-				var si = s.GetSessionImplementation();
-				Assert.AreEqual(value, type.Get(reader, "guid", si));
-				Assert.AreEqual(value, type.Get(reader, 0, si));
-				Assert.AreEqual(value, type.Get(reader, "varchar", si));
-				Assert.AreEqual(value, type.Get(reader, 1, si));
-			}
+			using var s = OpenSession();
+			var si = s.GetSessionImplementation();
+
+			Assert.That(type.Get(reader, 0, si), Is.EqualTo(value));
+			Assert.That(type.Get(reader, 1, si), Is.EqualTo(value));
+#pragma warning disable CS0618 // Type or member is obsolete
+			Assert.That(type.Get(reader, "guid", si), Is.EqualTo(value));
+			Assert.That(type.Get(reader, "varchar", si), Is.EqualTo(value));
+#pragma warning restore CS0618 // Type or member is obsolete
 		}
 	}
-}
+}

src/NHibernate/Type/AbstractBinaryType.cs

@@ -90,11 +90,6 @@ public override object Get(DbDataReader rs, int index, ISessionImplementor sessi
 			return ToExternalFormat(buffer);
 		}
 
-		public override object Get(DbDataReader rs, string name, ISessionImplementor session)
-		{
-			return Get(rs, rs.GetOrdinal(name), session);
-		}
-
 		public override int GetHashCode(object x)
 		{
 			byte[] bytes = ToInternalFormat(x);

src/NHibernate/Type/AbstractCharType.cs

@@ -30,11 +30,6 @@ public override object Get(DbDataReader rs, int index, ISessionImplementor sessi
 			return '\0'; // This line should never be executed
 		}
 
-		public override object Get(DbDataReader rs, string name, ISessionImplementor session)
-		{
-			return Get(rs, rs.GetOrdinal(name), session);
-		}
-
 		public override System.Type PrimitiveClass
 		{
 			get { return typeof(char); }

src/NHibernate/Type/AbstractDateTimeType.cs

@@ -58,10 +58,6 @@ protected virtual DateTime AdjustDateTime(DateTime dateValue) =>
 		public override object Get(DbDataReader rs, int index, ISessionImplementor session) =>
 			GetDateTime(rs, index, session);
 
-		/// <inheritdoc />
-		public override object Get(DbDataReader rs, string name, ISessionImplementor session) =>
-			Get(rs, rs.GetOrdinal(name), session);
-
 		/// <summary>
 		/// Get the <see cref="DateTime" /> in the <see cref="DbDataReader"/> for the Property.
 		/// </summary>

src/NHibernate/Type/AbstractStringType.cs

@@ -76,11 +76,6 @@ public override object Get(DbDataReader rs, int index, ISessionImplementor sessi
 			return Convert.ToString(rs[index]);
 		}
 
-		public override object Get(DbDataReader rs, string name, ISessionImplementor session)
-		{
-			return Convert.ToString(rs[name]);
-		}
-
 		public override bool IsEqual(object x, object y)
 		{
 			return Comparer.Equals(x, y);

src/NHibernate/Type/BooleanType.cs

@@ -43,11 +43,6 @@ public override object Get(DbDataReader rs, int index, ISessionImplementor sessi
 			return GetBooleanAsObject(Convert.ToBoolean(rs[index]));
 		}
 
-		public override object Get(DbDataReader rs, string name, ISessionImplementor session)
-		{
-			return GetBooleanAsObject(Convert.ToBoolean(rs[name]));
-		}
-
 		public override System.Type PrimitiveClass => typeof(bool);
 
 		public override System.Type ReturnedClass => typeof(bool);

src/NHibernate/Type/ByteType.cs

@@ -32,15 +32,6 @@ public override object Get(DbDataReader rs, int index, ISessionImplementor sessi
 			};
 		}
 
-		public override object Get(DbDataReader rs, string name, ISessionImplementor session)
-		{
-			return rs[name] switch
-			{
-				BigInteger bi => (byte) bi,
-				var c => Convert.ToByte(c)
-			};
-		}
-
 		public override System.Type ReturnedClass
 		{
 			get { return typeof(byte); }

src/NHibernate/Type/CharBooleanType.cs

@@ -40,11 +40,6 @@ public override object Get(DbDataReader rs, int index, ISessionImplementor sessi
 			}
 		}
 
-		public override object Get(DbDataReader rs, string name, ISessionImplementor session)
-		{
-			return Get(rs, rs.GetOrdinal(name), session);
-		}
-
 		public override void Set(DbCommand cmd, Object value, int index, ISessionImplementor session)
 		{
 			cmd.Parameters[index].Value = ToCharacter(value);

src/NHibernate/Type/CultureInfoType.cs

@@ -32,12 +32,6 @@ public override object Get(DbDataReader rs, int index, ISessionImplementor sessi
 			return ParseStringRepresentation(NHibernateUtil.String.Get(rs, index, session));
 		}
 
-		/// <inheritdoc />
-		public override object Get(DbDataReader rs, string name, ISessionImplementor session)
-		{
-			return Get(rs, rs.GetOrdinal(name), session);
-		}
-
 		/// <inheritdoc />
 		public override void Set(DbCommand cmd, object value, int index, ISessionImplementor session)
 		{

src/NHibernate/Type/DateTimeOffSetType.cs

@@ -73,11 +73,6 @@ public override object Get(DbDataReader rs, int index, ISessionImplementor sessi
 			}
 		}
 
-		public override object Get(DbDataReader rs, string name, ISessionImplementor session)
-		{
-			return Get(rs, rs.GetOrdinal(name), session);
-		}
-
 		public object Next(object current, ISessionImplementor session)
 		{
 			return Seed(session);

src/NHibernate/Type/DecimalType.cs

@@ -27,11 +27,6 @@ public override object Get(DbDataReader rs, int index, ISessionImplementor sessi
 			return Convert.ToDecimal(rs[index]);
 		}
 
-		public override object Get(DbDataReader rs, string name, ISessionImplementor session)
-		{
-			return Convert.ToDecimal(rs[name]);
-		}
-
 		public override System.Type ReturnedClass
 		{
 			get { return typeof(Decimal); }

src/NHibernate/Type/DoubleType.cs

@@ -30,15 +30,6 @@ public override object Get(DbDataReader rs, int index, ISessionImplementor sessi
 			};
 		}
 
-		public override object Get(DbDataReader rs, string name, ISessionImplementor session)
-		{
-			return rs[name] switch
-			{
-				BigInteger bi => (double) bi,
-				var v => Convert.ToDouble(v)
-			};
-		}
-
 		/// <summary></summary>
 		public override System.Type ReturnedClass
 		{

src/NHibernate/Type/EnumCharType.cs

@@ -119,11 +119,6 @@ public override object Get(DbDataReader rs, int index, ISessionImplementor sessi
 			}
 		}
 
-		public override object Get(DbDataReader rs, string name, ISessionImplementor session)
-		{
-			return Get(rs, rs.GetOrdinal(name), session);
-		}
-
 		public override string Name
 		{
 			get { return "enumchar - " + this.ReturnedClass.Name; }

src/NHibernate/Type/EnumStringType.cs

@@ -148,11 +148,6 @@ public override object Get(DbDataReader rs, int index, ISessionImplementor sessi
 			}
 		}
 
-		public override object Get(DbDataReader rs, string name, ISessionImplementor session)
-		{
-			return Get(rs, rs.GetOrdinal(name), session);
-		}
-
 		/// <inheritdoc />
 		public override string ToLoggableString(object value, ISessionFactoryImplementor factory)
 		{

src/NHibernate/Type/GuidType.cs

@@ -33,11 +33,6 @@ public override object Get(DbDataReader rs, int index, ISessionImplementor sessi
 			return new Guid(Convert.ToString(rs[index]));
 		}
 
-		public override object Get(DbDataReader rs, string name, ISessionImplementor session)
-		{
-			return Get(rs, rs.GetOrdinal(name), session);
-		}
-
 		/// <summary></summary>
 		public override System.Type ReturnedClass
 		{

src/NHibernate/Type/Int16Type.cs

@@ -44,22 +44,6 @@ public override object Get(DbDataReader rs, int index, ISessionImplementor sessi
 			}
 		}
 
-		public override object Get(DbDataReader rs, string name, ISessionImplementor session)
-		{
-			try
-			{
-				return rs[name]switch
-				{
-					BigInteger bi => (short) bi,
-					var c => Convert.ToInt16(c)
-				};
-			}
-			catch (Exception ex)
-			{
-				throw new FormatException(string.Format("Input string '{0}' was not in the correct format.", rs[name]), ex);
-			}
-		}
-
 		public override System.Type ReturnedClass
 		{
 			get { return typeof(Int16); }

src/NHibernate/Type/Int32Type.cs

@@ -45,22 +45,6 @@ public override object Get(DbDataReader rs, int index, ISessionImplementor sessi
 			}
 		}
 
-		public override object Get(DbDataReader rs, string name, ISessionImplementor session)
-		{
-			try
-			{
-				return rs[name] switch
-				{
-					BigInteger bi => (int) bi,
-					var c => Convert.ToInt32(c)
-				};
-			}
-			catch (Exception ex)
-			{
-				throw new FormatException(string.Format("Input string '{0}' was not in the correct format.", rs[name]), ex);
-			}
-		}
-
 		public override System.Type ReturnedClass
 		{
 			get { return typeof(Int32); }

src/NHibernate/Type/Int64Type.cs

@@ -44,22 +44,6 @@ public override object Get(DbDataReader rs, int index, ISessionImplementor sessi
 			}
 		}
 
-		public override object Get(DbDataReader rs, string name, ISessionImplementor session)
-		{
-			try
-			{
-				return rs[name] switch
-				{
-					BigInteger bi => (long) bi,
-					var c => Convert.ToInt64(c)
-				};
-			}
-			catch (Exception ex)
-			{
-				throw new FormatException(string.Format("Input string '{0}' was not in the correct format.", rs[name]), ex);
-			}
-		}
-
 		public override System.Type ReturnedClass
 		{
 			get { return typeof(Int64); }

src/NHibernate/Type/NullableType.cs

@@ -80,7 +80,10 @@ protected NullableType(SqlType sqlType)
 		/// Most implementors just call the <see cref="Get(DbDataReader, int, ISessionImplementor)"/> 
 		/// overload of this method.
 		/// </remarks>
-		public abstract object Get(DbDataReader rs, string name, ISessionImplementor session);
+		// Since v5.6
+		[Obsolete("This method has no more usages and will be removed in a future version.")]
+		public virtual object Get(DbDataReader rs, string name, ISessionImplementor session) =>
+			Get(rs, rs.GetOrdinal(name), session);
 
 		/// <summary>
 		/// A representation of the value to be embedded in an XML element 

src/NHibernate/Type/PersistentEnumType.cs

@@ -226,11 +226,6 @@ public override void Set(DbCommand cmd, object value, int index, ISessionImpleme
 			cmd.Parameters[index].Value = value != null ? GetValue(value) : DBNull.Value;
 		}
 
-		public override object Get(DbDataReader rs, string name, ISessionImplementor session)
-		{
-			return Get(rs, rs.GetOrdinal(name), session);
-		}
-
 		public override string Name
 		{
 			get { return ReturnedClass.FullName; }