Merge 431c00e into 3940f0b

ExtendedXmlSerializer · Nov 23, 2020 · b1ff672 · b1ff672
2 parents 3940f0b + 431c00e
commit b1ff672
Show file tree

Hide file tree

Showing 12 changed files with 249 additions and 88 deletions.
diff --git a/src/ExtendedXmlSerializer/ContentModel/Content/NullableContents.cs b/src/ExtendedXmlSerializer/ContentModel/Content/NullableContents.cs
diff --git a/src/ExtendedXmlSerializer/ContentModel/Members/MemberSerializers.cs b/src/ExtendedXmlSerializer/ContentModel/Members/MemberSerializers.cs
@@ -60,8 +60,7 @@ bool IsMember(IMember profile)
 		IMemberSerializer Content(IMember profile, IMemberAccess access)
 		{
 			var identity = new Identity<object>(profile);
-			var isMember = IsMember(profile);
-			var composite = isMember
+			var composite = IsMember(profile)
 				                ? (IWriter<object>)new MemberPropertyWriter(identity)
 				                : identity;
 			var start  = composite.Adapt();

diff --git a/src/ExtendedXmlSerializer/ExtensionModel/Content/Contents.cs b/src/ExtendedXmlSerializer/ExtensionModel/Content/Contents.cs
@@ -46,9 +46,6 @@ public IServiceRepository Get(IServiceRepository parameter)
 			            .DecorateContentsWith<ReflectionContents>()
 			            .When(ReflectionContentSpecification.Default)
 
-			            .DecorateContentsWith<NullableContents>()
-			            .When(IsNullableTypeSpecification.Default)
-
 			            .DecorateContentsWith<ConverterContents>()
 			            .When<ConverterSpecification>()
 			            .DecorateContentsWith<RegisteredContents>()

diff --git a/src/ExtendedXmlSerializer/ExtensionModel/Content/Members/ParameterizedResultHandler.cs b/src/ExtendedXmlSerializer/ExtensionModel/Content/Members/ParameterizedResultHandler.cs
@@ -7,12 +7,9 @@ sealed class ParameterizedResultHandler : IInnerContentResult
 	{
 		readonly IInnerContentResult _result;
 
-		public ParameterizedResultHandler(IInnerContentResult result)
-		{
-			_result = result;
-		}
+		public ParameterizedResultHandler(IInnerContentResult result) => _result = result;
 
 		public object Get(IInnerContent parameter)
-			=> (parameter.Current as IActivationContext)?.Get() ?? _result.Get(parameter);
+			=> parameter.Current is IActivationContext context ? context.Get() : _result.Get(parameter);
 	}
 }
diff --git a/src/ExtendedXmlSerializer/ExtensionModel/DefaultExtensions.cs b/src/ExtendedXmlSerializer/ExtensionModel/DefaultExtensions.cs
@@ -60,6 +60,7 @@ public override IEnumerator<ISerializerExtension> GetEnumerator()
 			yield return new MemberFormatExtension();
 			yield return ImmutableArrayExtension.Default;
 			yield return SerializationExtension.Default;
+			yield return NullableStructureAwareExtension.Default;
 			yield return new CustomSerializationExtension();
 			yield return CachingExtension.Default;
 		}

diff --git a/src/ExtendedXmlSerializer/ExtensionModel/SerializationExtension.cs b/src/ExtendedXmlSerializer/ExtensionModel/SerializationExtension.cs
@@ -32,7 +32,6 @@ public IServiceRepository Get(IServiceRepository parameter)
 			            .Register<RuntimeSerializers>()
 			            .Register<ISerializers, Serializers>()
 			            .RegisterInstance(RuntimeSerializationExceptionMessage.Default)
-			            .Decorate<ISerializers, NullableAwareSerializers>()
 			            .Decorate<ISerializers, ReferenceAwareSerializers>()
 			            .Decorate<ISerializers, DynamicAwareSerializers>()
 			            .Decorate<IContents, RecursionAwareContents>();

diff --git a/src/ExtendedXmlSerializer/ExtensionModel/Types/NullableStructureAwareExtension.cs b/src/ExtendedXmlSerializer/ExtensionModel/Types/NullableStructureAwareExtension.cs
@@ -0,0 +1,33 @@
+using ExtendedXmlSerializer.ContentModel;
+using ExtendedXmlSerializer.ContentModel.Content;
+using System;
+using System.Reflection;
+
+namespace ExtendedXmlSerializer.ExtensionModel.Types
+{
+	sealed class NullableStructureAwareExtension : ISerializerExtension
+	{
+		public static NullableStructureAwareExtension Default { get; } = new NullableStructureAwareExtension();
+
+		NullableStructureAwareExtension() {}
+
+		public IServiceRepository Get(IServiceRepository parameter)
+			=> parameter.DecorateContentsWith<NullableStructureAwareContents>().Then();
+
+		public void Execute(IServices parameter) {}
+
+		sealed class NullableStructureAwareContents : IContents
+		{
+			readonly IContents _previous;
+
+			public NullableStructureAwareContents(IContents previous) => _previous = previous;
+
+			public ISerializer Get(TypeInfo parameter)
+			{
+				var underlying = Nullable.GetUnderlyingType(parameter);
+				var serializer = _previous.Get(underlying != null ? underlying : parameter);
+				return serializer;
+			}
+		}
+	}
+}
diff --git a/src/ExtendedXmlSerializer/ExtensionModel/Xml/AutoMemberFormatExtension.cs b/src/ExtendedXmlSerializer/ExtensionModel/Xml/AutoMemberFormatExtension.cs
@@ -1,8 +1,8 @@
-using System.Reflection;
 using ExtendedXmlSerializer.ContentModel.Conversion;
 using ExtendedXmlSerializer.ContentModel.Members;
 using ExtendedXmlSerializer.Core;
 using ExtendedXmlSerializer.Core.Specifications;
+using System.Reflection;
 
 namespace ExtendedXmlSerializer.ExtensionModel.Xml
 {
@@ -48,11 +48,7 @@ public MemberConverters(IMemberConverters members, IConverters converters)
 				_converters = converters;
 			}
 
-			public IConverter Get(MemberInfo parameter)
-			{
-				var converter = _members.Get(parameter);
-				return converter ?? From(parameter);
-			}
+			public IConverter Get(MemberInfo parameter) => _members.Get(parameter) ?? From(parameter);
 
 			IConverter From(MemberDescriptor parameter) => _converters.Get(parameter.MemberType.AccountForNullable());
 		}

diff --git a/src/ExtendedXmlSerializer/ReflectionModel/IsNullableTypeSpecification.cs b/src/ExtendedXmlSerializer/ReflectionModel/IsNullableTypeSpecification.cs
diff --git a/test/ExtendedXmlSerializer.Tests.ReportedIssues/Issue477Tests.cs b/test/ExtendedXmlSerializer.Tests.ReportedIssues/Issue477Tests.cs
@@ -0,0 +1,92 @@
+using ExtendedXmlSerializer.Configuration;
+using ExtendedXmlSerializer.Tests.ReportedIssues.Support;
+using FluentAssertions;
+using System;
+using Xunit;
+
+#nullable enable
+namespace ExtendedXmlSerializer.Tests.ReportedIssues
+{
+	public sealed class Issue477Tests
+	{
+		[Fact]
+		public void SerializeAndDeserializeInstanceA()
+		{
+			var serializer = new ConfigurationContainer().EnableParameterizedContentWithPropertyAssignments()
+			                                             .Create()
+			                                             .ForTesting();
+
+			var instance = new A { Point = new Point(2, 3) };
+
+			serializer.Cycle(instance).Should().BeEquivalentTo(instance);
+		}
+
+		[Fact]
+		public void SerializeAndDeserializeInstanceB()
+		{
+			var serializer = new ConfigurationContainer().EnableParameterizedContent()
+			                                             .Create()
+			                                             .ForTesting();
+
+			var instance = new B { NullablePoint = new Point(24, 7) };
+
+			serializer.Cycle(instance).Should().BeEquivalentTo(instance);
+		}
+
+		[Fact]
+		public void SerializeAndDeserializeInstanceBNull()
+		{
+			var serializer = new ConfigurationContainer().EnableParameterizedContent()
+			                                             .Create()
+			                                             .ForTesting();
+
+			var instance = new B { NullablePoint = null };
+
+			serializer.Assert(instance, @"<?xml version=""1.0"" encoding=""utf-8""?><Issue477Tests-B xmlns=""clr-namespace:ExtendedXmlSerializer.Tests.ReportedIssues;assembly=ExtendedXmlSerializer.Tests.ReportedIssues"" />");
+
+			serializer.Cycle(instance).Should().BeEquivalentTo(instance);
+		}
+
+		public sealed class A
+		{
+			public Point Point { get; set; }
+		}
+
+		public sealed class B
+		{
+			public Point? NullablePoint { get; set; }
+		}
+
+		public readonly struct Point : IEquatable<Point>
+		{
+			public Point(int x, int y)
+			{
+				X = x;
+				Y = y;
+			}
+
+			public int X { get; }
+
+			public int Y { get; }
+
+			public bool Equals(Point other) => X == other.X && Y == other.Y;
+
+			public override bool Equals(object? obj) => obj is Point other && Equals(other);
+
+			public override int GetHashCode()
+			{
+				unchecked
+				{
+					return (X * 397) ^ Y;
+				}
+			}
+
+			public override string ToString() => $"({X}, {Y})";
+
+			public static bool operator ==(Point left, Point right) => left.Equals(right);
+
+			public static bool operator !=(Point left, Point right) => !left.Equals(right);
+		}
+	}
+}
+#nullable restore
diff --git a/test/ExtendedXmlSerializer.Tests.ReportedIssues/Issue477Tests_Extended.cs b/test/ExtendedXmlSerializer.Tests.ReportedIssues/Issue477Tests_Extended.cs
@@ -0,0 +1,41 @@
+using ExtendedXmlSerializer.Configuration;
+using ExtendedXmlSerializer.Tests.ReportedIssues.Support;
+using FluentAssertions;
+using System;
+using Xunit;
+
+namespace ExtendedXmlSerializer.Tests.ReportedIssues
+{
+	public sealed class Issue477Tests_Extended
+	{
+		[Fact]
+		public void Verify()
+		{
+			var serializer = new ConfigurationContainer().Type<DateTime>()
+			                                             .Register()
+			                                             .Serializer()
+			                                             .ByCalling((writer, date) => writer.Content(date.ToString("yyyy-MM-dd")),
+			                                                        null)
+			                                             .Type<DateTime?>()
+			                                             .Register()
+			                                             .Serializer()
+			                                             .ByCalling((writer, date) => writer.Content(date?.ToString("yyyy-MM-dd") ?? string.Empty), null)
+			                                             .Create()
+			                                             .ForTesting();
+
+			var instance = new Test();
+			var content = serializer.Serialize(instance);
+
+			content.Should().Be(@"<?xml version=""1.0"" encoding=""utf-8""?><Issue477Tests_Extended-Test xmlns=""clr-namespace:ExtendedXmlSerializer.Tests.ReportedIssues;assembly=ExtendedXmlSerializer.Tests.ReportedIssues""><Date1>2020-11-23</Date1><Date3>2020-11-23</Date3></Issue477Tests_Extended-Test>");
+
+
+		}
+
+		class Test
+		{
+			public DateTime Date1 { get; set; } = DateTime.Now;  // Formatted OK
+			public DateTime? Date2 { get; set; } = null;         // Is not emitted = OK
+			public DateTime? Date3 { get; set; } = DateTime.Now; // Completety ignores configured formatting
+		}
+	}
+}