Fix immutable collections support trivial issues.

yfakariya · yfakariya · commit fc6e12c4b90d · 2016-07-18T18:20:07.000+09:00
* Change static readonly to readonly for better memory usage.
* Remove redundant item serializer.
* Fix error message.
diff --git a/src/MsgPack/Serialization/DefaultSerializers/ImmutableCollectionSerializer`2.cs b/src/MsgPack/Serialization/DefaultSerializers/ImmutableCollectionSerializer`2.cs
@@ -37,7 +37,7 @@ namespace MsgPack.Serialization.DefaultSerializers
 	internal class ImmutableCollectionSerializer<T, TItem> : MessagePackSerializer<T>
 		where T : IEnumerable<TItem>
 	{
-		protected static readonly Func<TItem[], T> Factory = FindFactory();
+		protected readonly Func<TItem[], T> Factory;
 
 		private static Func<TItem[], T> FindFactory()
 		{
@@ -98,12 +98,13 @@ private static Func<TItem[], T> FindFactory()
 #endif // !UNITY
 		}
 
-		private readonly MessagePackSerializer<TItem> _itemSerializer;
+		protected readonly MessagePackSerializer<TItem> ItemSerializer;
 
 		public ImmutableCollectionSerializer( SerializationContext ownerContext, PolymorphismSchema itemsSchema )
 			: base( ownerContext )
 		{
-			this._itemSerializer = ownerContext.GetSerializer<TItem>( itemsSchema );
+			this.ItemSerializer = ownerContext.GetSerializer<TItem>( itemsSchema );
+			this.Factory = FindFactory();
 		}
 
 		[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", MessageId = "0", Justification = "Validated by caller in base class" )]
@@ -113,7 +114,7 @@ protected internal override void PackToCore( Packer packer, T objectTree )
 
 			foreach ( var item in objectTree )
 			{
-				this._itemSerializer.PackTo( packer, item );
+				this.ItemSerializer.PackTo( packer, item );
 			}
 		}
 
@@ -136,11 +137,11 @@ protected internal override T UnpackFromCore( Unpacker unpacker )
 						SerializationExceptions.ThrowUnexpectedEndOfStream( unpacker );
 					}
 
-					buffer[ i ] = this._itemSerializer.UnpackFrom( subTreeUnpacker );
+					buffer[ i ] = this.ItemSerializer.UnpackFrom( subTreeUnpacker );
 				}
 			}
 
-			return Factory( buffer );
+			return this.Factory( buffer );
 		}
 
 		protected internal override void UnpackToCore( Unpacker unpacker, T collection )
@@ -162,7 +163,7 @@ protected internal override async Task PackToAsyncCore( Packer packer, T objectT
 
 			foreach ( var item in objectTree )
 			{
-				await this._itemSerializer.PackToAsync( packer, item, cancellationToken ).ConfigureAwait( false );
+				await this.ItemSerializer.PackToAsync( packer, item, cancellationToken ).ConfigureAwait( false );
 			}
 		}
 
@@ -184,11 +185,11 @@ protected internal override async Task<T> UnpackFromAsyncCore( Unpacker unpacker
 						SerializationExceptions.ThrowUnexpectedEndOfStream( unpacker );
 					}
 
-					buffer[ i ] = await this._itemSerializer.UnpackFromAsync( subTreeUnpacker, cancellationToken ).ConfigureAwait( false );
+					buffer[ i ] = await this.ItemSerializer.UnpackFromAsync( subTreeUnpacker, cancellationToken ).ConfigureAwait( false );
 				}
 			}
 
-			return Factory( buffer );
+			return this.Factory( buffer );
 		}
 
 		protected internal override Task UnpackToAsyncCore( Unpacker unpacker, T collection, CancellationToken cancellationToken )
diff --git a/src/MsgPack/Serialization/DefaultSerializers/ImmutableDictionarySerializer`3.cs b/src/MsgPack/Serialization/DefaultSerializers/ImmutableDictionarySerializer`3.cs
@@ -37,7 +37,7 @@ namespace MsgPack.Serialization.DefaultSerializers
 	internal sealed class ImmutableDictionarySerializer<T, TKey, TValue> : MessagePackSerializer<T>
 		where T : IEnumerable<KeyValuePair<TKey, TValue>>
 	{
-		private static readonly Func<KeyValuePair<TKey, TValue>[], T> _factory = FindFactory();
+		private readonly Func<KeyValuePair<TKey, TValue>[], T> _factory;
 
 		private static Func<KeyValuePair<TKey, TValue>[], T> FindFactory()
 		{
@@ -85,7 +85,7 @@ private static Func<KeyValuePair<TKey, TValue>[], T> FindFactory()
 								CultureInfo.CurrentCulture,
 								"'{0}' does not have CreateRange({1}[]) public static method.",
 								factoryType.AssemblyQualifiedName,
-								typeof( IEnumerable<KeyValuePair<TKey, TValue>> )
+								typeof( KeyValuePair<TKey, TValue> )
 							)
 						);
 					};
@@ -107,6 +107,7 @@ public ImmutableDictionarySerializer( SerializationContext ownerContext, Polymor
 		{
 			this._keySerializer = ownerContext.GetSerializer<TKey>( keysSchema );
 			this._valueSerializer = ownerContext.GetSerializer<TValue>( valuesSchema );
+			this._factory = FindFactory();
 		}
 
 		[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", MessageId = "0", Justification = "Validated by caller in base class" )]
@@ -153,7 +154,7 @@ protected internal override T UnpackFromCore( Unpacker unpacker )
 				}
 			}
 
-			return _factory( buffer );
+			return this._factory( buffer );
 		}
 
 		protected internal override void UnpackToCore( Unpacker unpacker, T collection )
@@ -211,7 +212,7 @@ protected internal override async Task<T> UnpackFromAsyncCore( Unpacker unpacker
 				}
 			}
 
-			return _factory( buffer );
+			return this._factory( buffer );
 		}
 
 		protected internal override Task UnpackToAsyncCore( Unpacker unpacker, T collection, CancellationToken cancellationToken )
diff --git a/src/MsgPack/Serialization/DefaultSerializers/ImmutableStackSerializer`2.cs b/src/MsgPack/Serialization/DefaultSerializers/ImmutableStackSerializer`2.cs
@@ -31,13 +31,8 @@ namespace MsgPack.Serialization.DefaultSerializers
 	internal sealed class ImmutableStackSerializer<T, TItem> : ImmutableCollectionSerializer<T, TItem>
 		where T : IEnumerable<TItem>
 	{
-		private readonly MessagePackSerializer<TItem> _itemSerializer;
-
 		public ImmutableStackSerializer( SerializationContext ownerContext, PolymorphismSchema itemsSchema )
-			: base( ownerContext, itemsSchema )
-		{
-			this._itemSerializer = ownerContext.GetSerializer<TItem>( itemsSchema );
-		}
+			: base( ownerContext, itemsSchema ) { }
 
 		[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", MessageId = "0", Justification = "Validated by caller in base class" )]
 		protected internal override T UnpackFromCore( Unpacker unpacker )
@@ -59,11 +54,11 @@ protected internal override T UnpackFromCore( Unpacker unpacker )
 						SerializationExceptions.ThrowUnexpectedEndOfStream( unpacker );
 					}
 
-					buffer[ i ] = this._itemSerializer.UnpackFrom( subTreeUnpacker );
+					buffer[ i ] = this.ItemSerializer.UnpackFrom( subTreeUnpacker );
 				}
 			}
 
-			return Factory( buffer );
+			return this.Factory( buffer );
 		}
 
 #if FEATURE_TAP
@@ -87,11 +82,11 @@ protected internal override async Task<T> UnpackFromAsyncCore( Unpacker unpacker
 						SerializationExceptions.ThrowUnexpectedEndOfStream( unpacker );
 					}
 
-					buffer[ i ] = await this._itemSerializer.UnpackFromAsync( subTreeUnpacker, cancellationToken ).ConfigureAwait( false );
+					buffer[ i ] = await this.ItemSerializer.UnpackFromAsync( subTreeUnpacker, cancellationToken ).ConfigureAwait( false );
 				}
 			}
 
-			return Factory( buffer );
+			return this.Factory( buffer );
 		}
 
 #endif // FEATURE_TAP

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ namespace MsgPack.Serialization.DefaultSerializers`
`37`	`37`	`internal class ImmutableCollectionSerializer<T, TItem> : MessagePackSerializer<T>`
`38`	`38`	`where T : IEnumerable<TItem>`
`39`	`39`	`{`
`40`		`- protected static readonly Func<TItem[], T> Factory = FindFactory();`
	`40`	`+ protected readonly Func<TItem[], T> Factory;`
`41`	`41`
`42`	`42`	`private static Func<TItem[], T> FindFactory()`
`43`	`43`	`{`
`@@ -98,12 +98,13 @@ private static Func<TItem[], T> FindFactory()`
`98`	`98`	`#endif // !UNITY`
`99`	`99`	`}`
`100`	`100`
`101`		`- private readonly MessagePackSerializer<TItem> _itemSerializer;`
	`101`	`+ protected readonly MessagePackSerializer<TItem> ItemSerializer;`
`102`	`102`
`103`	`103`	`public ImmutableCollectionSerializer( SerializationContext ownerContext, PolymorphismSchema itemsSchema )`
`104`	`104`	`: base( ownerContext )`
`105`	`105`	`{`
`106`		`- this._itemSerializer = ownerContext.GetSerializer<TItem>( itemsSchema );`
	`106`	`+ this.ItemSerializer = ownerContext.GetSerializer<TItem>( itemsSchema );`
	`107`	`+ this.Factory = FindFactory();`
`107`	`108`	`}`
`108`	`109`
`109`	`110`	`[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", MessageId = "0", Justification = "Validated by caller in base class" )]`
`@@ -113,7 +114,7 @@ protected internal override void PackToCore( Packer packer, T objectTree )`
`113`	`114`
`114`	`115`	`foreach ( var item in objectTree )`
`115`	`116`	`{`
`116`		`- this._itemSerializer.PackTo( packer, item );`
	`117`	`+ this.ItemSerializer.PackTo( packer, item );`
`117`	`118`	`}`
`118`	`119`	`}`
`119`	`120`
`@@ -136,11 +137,11 @@ protected internal override T UnpackFromCore( Unpacker unpacker )`
`136`	`137`	`SerializationExceptions.ThrowUnexpectedEndOfStream( unpacker );`
`137`	`138`	`}`
`138`	`139`
`139`		`- buffer[ i ] = this._itemSerializer.UnpackFrom( subTreeUnpacker );`
	`140`	`+ buffer[ i ] = this.ItemSerializer.UnpackFrom( subTreeUnpacker );`
`140`	`141`	`}`
`141`	`142`	`}`
`142`	`143`
`143`		`- return Factory( buffer );`
	`144`	`+ return this.Factory( buffer );`
`144`	`145`	`}`
`145`	`146`
`146`	`147`	`protected internal override void UnpackToCore( Unpacker unpacker, T collection )`
`@@ -162,7 +163,7 @@ protected internal override async Task PackToAsyncCore( Packer packer, T objectT`
`162`	`163`
`163`	`164`	`foreach ( var item in objectTree )`
`164`	`165`	`{`
`165`		`- await this._itemSerializer.PackToAsync( packer, item, cancellationToken ).ConfigureAwait( false );`
	`166`	`+ await this.ItemSerializer.PackToAsync( packer, item, cancellationToken ).ConfigureAwait( false );`
`166`	`167`	`}`
`167`	`168`	`}`
`168`	`169`
`@@ -184,11 +185,11 @@ protected internal override async Task<T> UnpackFromAsyncCore( Unpacker unpacker`
`184`	`185`	`SerializationExceptions.ThrowUnexpectedEndOfStream( unpacker );`
`185`	`186`	`}`
`186`	`187`
`187`		`- buffer[ i ] = await this._itemSerializer.UnpackFromAsync( subTreeUnpacker, cancellationToken ).ConfigureAwait( false );`
	`188`	`+ buffer[ i ] = await this.ItemSerializer.UnpackFromAsync( subTreeUnpacker, cancellationToken ).ConfigureAwait( false );`
`188`	`189`	`}`
`189`	`190`	`}`
`190`	`191`
`191`		`- return Factory( buffer );`
	`192`	`+ return this.Factory( buffer );`
`192`	`193`	`}`
`193`	`194`
`194`	`195`	`protected internal override Task UnpackToAsyncCore( Unpacker unpacker, T collection, CancellationToken cancellationToken )`
Original file line number	Diff line number	Diff line change
`@@ -31,13 +31,8 @@ namespace MsgPack.Serialization.DefaultSerializers`
`31`	`31`	`internal sealed class ImmutableStackSerializer<T, TItem> : ImmutableCollectionSerializer<T, TItem>`
`32`	`32`	`where T : IEnumerable<TItem>`
`33`	`33`	`{`
`34`		`- private readonly MessagePackSerializer<TItem> _itemSerializer;`
`35`		`-`
`36`	`34`	`public ImmutableStackSerializer( SerializationContext ownerContext, PolymorphismSchema itemsSchema )`
`37`		`- : base( ownerContext, itemsSchema )`
`38`		`- {`
`39`		`- this._itemSerializer = ownerContext.GetSerializer<TItem>( itemsSchema );`
`40`		`- }`
	`35`	`+ : base( ownerContext, itemsSchema ) { }`
`41`	`36`
`42`	`37`	`[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", MessageId = "0", Justification = "Validated by caller in base class" )]`
`43`	`38`	`protected internal override T UnpackFromCore( Unpacker unpacker )`
`@@ -59,11 +54,11 @@ protected internal override T UnpackFromCore( Unpacker unpacker )`
`59`	`54`	`SerializationExceptions.ThrowUnexpectedEndOfStream( unpacker );`
`60`	`55`	`}`
`61`	`56`
`62`		`- buffer[ i ] = this._itemSerializer.UnpackFrom( subTreeUnpacker );`
	`57`	`+ buffer[ i ] = this.ItemSerializer.UnpackFrom( subTreeUnpacker );`
`63`	`58`	`}`
`64`	`59`	`}`
`65`	`60`
`66`		`- return Factory( buffer );`
	`61`	`+ return this.Factory( buffer );`
`67`	`62`	`}`
`68`	`63`
`69`	`64`	`#if FEATURE_TAP`
`@@ -87,11 +82,11 @@ protected internal override async Task<T> UnpackFromAsyncCore( Unpacker unpacker`
`87`	`82`	`SerializationExceptions.ThrowUnexpectedEndOfStream( unpacker );`
`88`	`83`	`}`
`89`	`84`
`90`		`- buffer[ i ] = await this._itemSerializer.UnpackFromAsync( subTreeUnpacker, cancellationToken ).ConfigureAwait( false );`
	`85`	`+ buffer[ i ] = await this.ItemSerializer.UnpackFromAsync( subTreeUnpacker, cancellationToken ).ConfigureAwait( false );`
`91`	`86`	`}`
`92`	`87`	`}`
`93`	`88`
`94`		`- return Factory( buffer );`
	`89`	`+ return this.Factory( buffer );`
`95`	`90`	`}`
`96`	`91`
`97`	`92`	`#endif // FEATURE_TAP`