NHV-135 - fix serialization of exception.

 - Also fix a message issue as of NHV-118

Author: fredericDelaporte

src/NHibernate.Validator.Tests/NHibernate.Validator.Tests.csproj

@@ -214,6 +214,7 @@
     <Compile Include="SerializationHelper.cs" />
     <Compile Include="Serialization\ClassValidatorSerializationFixture.cs" />
     <Compile Include="Serialization\EventsSerializationFixture.cs" />
+    <Compile Include="Serialization\ExceptionSerializationFixture.cs" />
     <Compile Include="Serialization\RuleArgsSerializationFixture.cs" />
     <Compile Include="Serialization\ValidatorEngineSerializationFixture.cs" />
     <Compile Include="Serialization\ValidatorsSerializationFixture.cs" />

src/NHibernate.Validator.Tests/Serialization/ExceptionSerializationFixture.cs

@@ -0,0 +1,64 @@
+using System;
+using NHibernate.Validator.Engine;
+using NHibernate.Validator.Exceptions;
+using NUnit.Framework;
+
+namespace NHibernate.Validator.Tests.Serialization
+{
+	[TestFixture]
+	public class ExceptionSerializationFixture
+	{
+		[Test]
+		public void AssertionFailure()
+		{
+			var ex = new AssertionFailure();
+			Assert.That(
+				() => SerializationHelper.Deserialize(SerializationHelper.Serialize(ex)),
+				Throws.Nothing);
+		}
+
+		[Test]
+		public void InvalidAttributeNameException()
+		{
+			var ex = new InvalidAttributeNameException("blah", typeof(ExceptionSerializationFixture));
+			var dex = default(InvalidAttributeNameException);
+			Assert.That(
+				() => { dex = (InvalidAttributeNameException) SerializationHelper.Deserialize(SerializationHelper.Serialize(ex)); },
+				Throws.Nothing);
+			Assert.That(dex, Is.Not.Null);
+			Assert.That(dex.AttributeName, Is.EqualTo("blah"));
+			Assert.That(dex.Class, Is.EqualTo(typeof(ExceptionSerializationFixture)));
+		}
+
+		[Test]
+		public void InvalidPropertyNameException()
+		{
+			var ex = new InvalidPropertyNameException("blah", typeof(ExceptionSerializationFixture));
+			var dex = default(InvalidPropertyNameException);
+			Assert.That(
+				() => { dex = (InvalidPropertyNameException) SerializationHelper.Deserialize(SerializationHelper.Serialize(ex)); },
+				Throws.Nothing);
+			Assert.That(dex, Is.Not.Null);
+			Assert.That(dex.PropertyName, Is.EqualTo("blah"));
+			Assert.That(dex.Class, Is.EqualTo(typeof(ExceptionSerializationFixture)));
+		}
+
+		[Test]
+		public void InvalidStateException()
+		{
+			var state = new[] { new InvalidValue("blah", typeof(ExceptionSerializationFixture), "prop", null, null, null) };
+			var ex = new InvalidStateException(state);
+			var dex = default(InvalidStateException);
+			Assert.That(
+				() => { dex = (InvalidStateException) SerializationHelper.Deserialize(SerializationHelper.Serialize(ex)); },
+				Throws.Nothing);
+			Assert.That(dex, Is.Not.Null);
+			Assert.That(dex.InvalidValues, Has.Length.EqualTo(1));
+			Assert.That(
+				dex.InvalidValues[0],
+				Is.Not.Null.And.Property(nameof(InvalidValue.Message)).EqualTo("blah"));
+			Assert.That(dex.InvalidValues[0].EntityType, Is.EqualTo(typeof(ExceptionSerializationFixture)));
+			Assert.That(dex.InvalidValues[0].PropertyName, Is.EqualTo("prop"));
+		}
+	}
+}

src/NHibernate.Validator/Exceptions/AssertionFailureException.cs

@@ -7,6 +7,7 @@ namespace NHibernate.Validator.Exceptions
 	/// <summary>
 	/// Indicates failure of an assertion: a possible bug in NHibernate.Validator
 	/// </summary>
+	// 6.0 TODO: cease deriving from ApplicationException
 	[Serializable]
 	public class AssertionFailureException : ApplicationException
 	{

src/NHibernate.Validator/Exceptions/InvalidAttributeNameException.cs

@@ -1,34 +1,49 @@
 using System;
+using System.Runtime.Serialization;
+using System.Security;
 
 namespace NHibernate.Validator.Exceptions
 {
 	[Serializable]
 	public class InvalidAttributeNameException : ValidatorConfigurationException
 	{
-		private readonly string attributeName;
-		private readonly System.Type clazz;
-
-		public InvalidAttributeNameException(string attributeName, System.Type clazz)
+		public InvalidAttributeNameException(string attributeName, System.Type @class)
 			: base(
 				string.Format(
-					@"Attribute '{0}' was not found for the class {1}; 
+					@"Attribute '{0}' was not found for the class {1};
 Cause:
 - typo
 - Wrong namespace (the attribute must stay in the same namespace of the related class)",
-					attributeName, clazz.FullName))
+					attributeName,
+					@class.FullName))
 		{
-			this.attributeName = attributeName;
-			this.clazz = clazz;
+			AttributeName = attributeName;
+			Class = @class;
 		}
 
-		public string AttributeName
+		protected InvalidAttributeNameException(SerializationInfo info, StreamingContext context)
+			: base(info, context)
 		{
-			get { return attributeName; }
+			AttributeName = info.GetString(nameof(InvalidAttributeNameException) + "." + nameof(AttributeName));
+			var className = info.GetString(nameof(InvalidAttributeNameException) + "." + nameof(Class));
+			if (!string.IsNullOrEmpty(className))
+				Class = System.Type.GetType(className, true);
 		}
 
-		public System.Type Clazz
+		[SecurityCritical]
+		public override void GetObjectData(SerializationInfo info, StreamingContext context)
 		{
-			get { return clazz; }
+			base.GetObjectData(info, context);
+			info.AddValue(
+				nameof(InvalidAttributeNameException) + "." + nameof(AttributeName),
+				AttributeName);
+			info.AddValue(
+				nameof(InvalidAttributeNameException) + "." + nameof(Class),
+				Class?.AssemblyQualifiedName);
 		}
+
+		public string AttributeName { get; }
+
+		public System.Type Class { get; }
 	}
-}
+}

src/NHibernate.Validator/Exceptions/InvalidPropertyNameException.cs

@@ -1,33 +1,54 @@
 using System;
+using System.Runtime.Serialization;
+using System.Security;
 
 namespace NHibernate.Validator.Exceptions
 {
 	[Serializable]
 	public class InvalidPropertyNameException : ValidatorConfigurationException
 	{
-		private readonly string propertyName;
-		private readonly System.Type clazz;
-
-		public InvalidPropertyNameException(string propertyName, System.Type clazz)
-			: this(string.Format("Property or field \"{0}\" was not found in the class: \"{1}\" ", propertyName, clazz.FullName), propertyName, clazz)
+		public InvalidPropertyNameException(string propertyName, System.Type @class)
+			: this(
+				string.Format("Property or field \"{0}\" was not found in the class: \"{1}\" ", propertyName, @class.FullName),
+				propertyName,
+				@class)
 		{
 		}
 
-		public InvalidPropertyNameException(string message, string propertyName, System.Type clazz)
+		public InvalidPropertyNameException(string message, string propertyName, System.Type @class)
 			: base(message)
 		{
-			this.propertyName = propertyName;
-			this.clazz = clazz;
+			PropertyName = propertyName;
+			Class = @class;
 		}
 
-		public string PropertyName
+		protected InvalidPropertyNameException(SerializationInfo info, StreamingContext context)
+			: base(info, context)
 		{
-			get { return propertyName; }
+			PropertyName = info.GetString(nameof(InvalidPropertyNameException) + "." + nameof(PropertyName));
+			var className = info.GetString(nameof(InvalidPropertyNameException) + "." + nameof(Class));
+			if (!string.IsNullOrEmpty(className))
+				Class = System.Type.GetType(className, true);
 		}
 
-		public System.Type Clazz
+		[SecurityCritical]
+		public override void GetObjectData(SerializationInfo info, StreamingContext context)
 		{
-			get { return clazz; }
+			base.GetObjectData(info, context);
+			info.AddValue(
+				nameof(InvalidPropertyNameException) + "." + nameof(PropertyName),
+				PropertyName);
+			info.AddValue(
+				nameof(InvalidPropertyNameException) + "." + nameof(Class),
+				Class?.AssemblyQualifiedName);
 		}
+
+		public string PropertyName { get; }
+
+		public System.Type Class { get; }
+
+		// Since v5.1
+		[Obsolete("Please use Class instead.")]
+		public System.Type Clazz => Class;
 	}
 }

src/NHibernate.Validator/Exceptions/InvalidStateException.cs

@@ -1,29 +1,52 @@
 using System;
+using System.Runtime.Serialization;
+using System.Security;
 using NHibernate.Validator.Engine;
 
 namespace NHibernate.Validator.Exceptions
 {
 	[Serializable]
 	public class InvalidStateException : HibernateException
 	{
-		private readonly InvalidValue[] _invalidValues;
-
-		public InvalidStateException(string message, Exception inner) : base(message, inner) { }
+		public InvalidStateException(string message, Exception inner) : base(message, inner)
+		{
+		}
 
 		public InvalidStateException(InvalidValue[] invalidValues)
-			: this(invalidValues, invalidValues[0].GetType().Name)
+			: this(invalidValues, invalidValues[0].EntityType.Name)
 		{
 		}
 
-		public InvalidStateException(InvalidValue[] invalidValues, String className)
+		public InvalidStateException(InvalidValue[] invalidValues, string className)
 			: base("validation failed for: " + className)
 		{
-			_invalidValues = invalidValues;
+			InvalidValues = invalidValues;
+		}
+
+		protected InvalidStateException(SerializationInfo info, StreamingContext context)
+			: base(info, context)
+		{
+			InvalidValues = (InvalidValue[]) info.GetValue(
+				nameof(InvalidStateException) + "." + nameof(InvalidValues),
+				typeof(InvalidValue[]));
 		}
-        
-		public InvalidValue[] GetInvalidValues() 
+
+		[SecurityCritical]
+		public override void GetObjectData(SerializationInfo info, StreamingContext context)
+		{
+			base.GetObjectData(info, context);
+			info.AddValue(
+				nameof(InvalidStateException) + "." + nameof(InvalidValues),
+				InvalidValues);
+		}
+
+		public InvalidValue[] InvalidValues { get; }
+
+		// Since 5.1
+		[Obsolete("Use InvalidValues property instead.")]
+		public InvalidValue[] GetInvalidValues()
 		{
-			return _invalidValues;
+			return InvalidValues;
 		}
 	}
-}
+}