Improvement KnoiwnType exception message, and fix typo of types. Issue #95

yfakariya · yfakariya · commit f6b1290f1174 · 2015-07-20T12:51:43.000+09:00
diff --git a/src/MsgPack.Net35/MsgPack.Net35.csproj b/src/MsgPack.Net35/MsgPack.Net35.csproj
@@ -716,14 +716,14 @@
     <Compile Include="..\MsgPack\Serialization\Polymorphic\IPolymorphicHelperAttributes.cs">
       <Link>Serialization\Polymorphic\IPolymorphicHelperAttributes.cs</Link>
     </Compile>
-    <Compile Include="..\MsgPack\Serialization\Polymorphic\KnownTypePolymorhicMessagePackSerializer`1.cs">
-      <Link>Serialization\Polymorphic\KnownTypePolymorhicMessagePackSerializer`1.cs</Link>
+    <Compile Include="..\MsgPack\Serialization\Polymorphic\KnownTypePolymorphicMessagePackSerializer`1.cs">
+      <Link>Serialization\Polymorphic\KnownTypePolymorphicMessagePackSerializer`1.cs</Link>
     </Compile>
     <Compile Include="..\MsgPack\Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs">
       <Link>Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs</Link>
     </Compile>
-    <Compile Include="..\MsgPack\Serialization\Polymorphic\TypeEmbedingPolymorhicMessagePackSerializer`1.cs">
-      <Link>Serialization\Polymorphic\TypeEmbedingPolymorhicMessagePackSerializer`1.cs</Link>
+    <Compile Include="..\MsgPack\Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs">
+      <Link>Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs</Link>
     </Compile>
     <Compile Include="..\MsgPack\Serialization\Polymorphic\TypeInfoEncoder.cs">
       <Link>Serialization\Polymorphic\TypeInfoEncoder.cs</Link>
diff --git a/src/MsgPack.Net40/MsgPack.Net40.csproj b/src/MsgPack.Net40/MsgPack.Net40.csproj
@@ -754,14 +754,14 @@
     <Compile Include="..\MsgPack\Serialization\Polymorphic\IPolymorphicHelperAttributes.cs">
       <Link>Serialization\Polymorphic\IPolymorphicHelperAttributes.cs</Link>
     </Compile>
-    <Compile Include="..\MsgPack\Serialization\Polymorphic\KnownTypePolymorhicMessagePackSerializer`1.cs">
-      <Link>Serialization\Polymorphic\KnownTypePolymorhicMessagePackSerializer`1.cs</Link>
+    <Compile Include="..\MsgPack\Serialization\Polymorphic\KnownTypePolymorphicMessagePackSerializer`1.cs">
+      <Link>Serialization\Polymorphic\KnownTypePolymorphicMessagePackSerializer`1.cs</Link>
     </Compile>
     <Compile Include="..\MsgPack\Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs">
       <Link>Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs</Link>
     </Compile>
-    <Compile Include="..\MsgPack\Serialization\Polymorphic\TypeEmbedingPolymorhicMessagePackSerializer`1.cs">
-      <Link>Serialization\Polymorphic\TypeEmbedingPolymorhicMessagePackSerializer`1.cs</Link>
+    <Compile Include="..\MsgPack\Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs">
+      <Link>Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs</Link>
     </Compile>
     <Compile Include="..\MsgPack\Serialization\Polymorphic\TypeInfoEncoder.cs">
       <Link>Serialization\Polymorphic\TypeInfoEncoder.cs</Link>
diff --git a/src/MsgPack.Silverlight.5/MsgPack.Silverlight.5.csproj b/src/MsgPack.Silverlight.5/MsgPack.Silverlight.5.csproj
@@ -733,14 +733,14 @@
     <Compile Include="..\MsgPack\Serialization\Polymorphic\IPolymorphicHelperAttributes.cs">
       <Link>Serialization\Polymorphic\IPolymorphicHelperAttributes.cs</Link>
     </Compile>
-    <Compile Include="..\MsgPack\Serialization\Polymorphic\KnownTypePolymorhicMessagePackSerializer`1.cs">
-      <Link>Serialization\Polymorphic\KnownTypePolymorhicMessagePackSerializer`1.cs</Link>
+    <Compile Include="..\MsgPack\Serialization\Polymorphic\KnownTypePolymorphicMessagePackSerializer`1.cs">
+      <Link>Serialization\Polymorphic\KnownTypePolymorphicMessagePackSerializer`1.cs</Link>
     </Compile>
     <Compile Include="..\MsgPack\Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs">
       <Link>Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs</Link>
     </Compile>
-    <Compile Include="..\MsgPack\Serialization\Polymorphic\TypeEmbedingPolymorhicMessagePackSerializer`1.cs">
-      <Link>Serialization\Polymorphic\TypeEmbedingPolymorhicMessagePackSerializer`1.cs</Link>
+    <Compile Include="..\MsgPack\Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs">
+      <Link>Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs</Link>
     </Compile>
     <Compile Include="..\MsgPack\Serialization\Polymorphic\TypeInfoEncoder.cs">
       <Link>Serialization\Polymorphic\TypeInfoEncoder.cs</Link>
diff --git a/src/MsgPack.Silverlight.WindowsPhone/MsgPack.Silverlight.WindowsPhone.csproj b/src/MsgPack.Silverlight.WindowsPhone/MsgPack.Silverlight.WindowsPhone.csproj
@@ -688,14 +688,14 @@
     <Compile Include="..\MsgPack\Serialization\Polymorphic\IPolymorphicHelperAttributes.cs">
       <Link>Serialization\Polymorphic\IPolymorphicHelperAttributes.cs</Link>
     </Compile>
-    <Compile Include="..\MsgPack\Serialization\Polymorphic\KnownTypePolymorhicMessagePackSerializer`1.cs">
-      <Link>Serialization\Polymorphic\KnownTypePolymorhicMessagePackSerializer`1.cs</Link>
+    <Compile Include="..\MsgPack\Serialization\Polymorphic\KnownTypePolymorphicMessagePackSerializer`1.cs">
+      <Link>Serialization\Polymorphic\KnownTypePolymorphicMessagePackSerializer`1.cs</Link>
     </Compile>
     <Compile Include="..\MsgPack\Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs">
       <Link>Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs</Link>
     </Compile>
-    <Compile Include="..\MsgPack\Serialization\Polymorphic\TypeEmbedingPolymorhicMessagePackSerializer`1.cs">
-      <Link>Serialization\Polymorphic\TypeEmbedingPolymorhicMessagePackSerializer`1.cs</Link>
+    <Compile Include="..\MsgPack\Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs">
+      <Link>Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs</Link>
     </Compile>
     <Compile Include="..\MsgPack\Serialization\Polymorphic\TypeInfoEncoder.cs">
       <Link>Serialization\Polymorphic\TypeInfoEncoder.cs</Link>
diff --git a/src/MsgPack.Unity3D.Full/MsgPack.Unity3D.Full.csproj b/src/MsgPack.Unity3D.Full/MsgPack.Unity3D.Full.csproj
@@ -457,14 +457,14 @@
     <Compile Include="..\MsgPack\Serialization\Polymorphic\IPolymorphicHelperAttributes.cs">
       <Link>Serialization\Polymorphic\IPolymorphicHelperAttributes.cs</Link>
     </Compile>
-    <Compile Include="..\MsgPack\Serialization\Polymorphic\KnownTypePolymorhicMessagePackSerializer`1.cs">
-      <Link>Serialization\Polymorphic\KnownTypePolymorhicMessagePackSerializer`1.cs</Link>
+    <Compile Include="..\MsgPack\Serialization\Polymorphic\KnownTypePolymorphicMessagePackSerializer`1.cs">
+      <Link>Serialization\Polymorphic\KnownTypePolymorphicMessagePackSerializer`1.cs</Link>
     </Compile>
     <Compile Include="..\MsgPack\Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs">
       <Link>Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs</Link>
     </Compile>
-    <Compile Include="..\MsgPack\Serialization\Polymorphic\TypeEmbedingPolymorhicMessagePackSerializer`1.cs">
-      <Link>Serialization\Polymorphic\TypeEmbedingPolymorhicMessagePackSerializer`1.cs</Link>
+    <Compile Include="..\MsgPack\Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs">
+      <Link>Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs</Link>
     </Compile>
     <Compile Include="..\MsgPack\Serialization\Polymorphic\TypeInfoEncoder.cs">
       <Link>Serialization\Polymorphic\TypeInfoEncoder.cs</Link>
diff --git a/src/MsgPack.Unity3D/MsgPack.Unity3D.csproj b/src/MsgPack.Unity3D/MsgPack.Unity3D.csproj
@@ -478,14 +478,14 @@
     <Compile Include="..\MsgPack\Serialization\Polymorphic\IPolymorphicHelperAttributes.cs">
       <Link>Serialization\Polymorphic\IPolymorphicHelperAttributes.cs</Link>
     </Compile>
-    <Compile Include="..\MsgPack\Serialization\Polymorphic\KnownTypePolymorhicMessagePackSerializer`1.cs">
-      <Link>Serialization\Polymorphic\KnownTypePolymorhicMessagePackSerializer`1.cs</Link>
+    <Compile Include="..\MsgPack\Serialization\Polymorphic\KnownTypePolymorphicMessagePackSerializer`1.cs">
+      <Link>Serialization\Polymorphic\KnownTypePolymorphicMessagePackSerializer`1.cs</Link>
     </Compile>
     <Compile Include="..\MsgPack\Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs">
       <Link>Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs</Link>
     </Compile>
-    <Compile Include="..\MsgPack\Serialization\Polymorphic\TypeEmbedingPolymorhicMessagePackSerializer`1.cs">
-      <Link>Serialization\Polymorphic\TypeEmbedingPolymorhicMessagePackSerializer`1.cs</Link>
+    <Compile Include="..\MsgPack\Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs">
+      <Link>Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs</Link>
     </Compile>
     <Compile Include="..\MsgPack\Serialization\Polymorphic\TypeInfoEncoder.cs">
       <Link>Serialization\Polymorphic\TypeInfoEncoder.cs</Link>
diff --git a/src/MsgPack.WinRT.Portable/MsgPack.WinRT.Portable.csproj b/src/MsgPack.WinRT.Portable/MsgPack.WinRT.Portable.csproj
@@ -628,14 +628,14 @@
     <Compile Include="..\MsgPack\Serialization\Polymorphic\IPolymorphicHelperAttributes.cs">
       <Link>Serialization\Polymorphic\IPolymorphicHelperAttributes.cs</Link>
     </Compile>
-    <Compile Include="..\MsgPack\Serialization\Polymorphic\KnownTypePolymorhicMessagePackSerializer`1.cs">
-      <Link>Serialization\Polymorphic\KnownTypePolymorhicMessagePackSerializer`1.cs</Link>
+    <Compile Include="..\MsgPack\Serialization\Polymorphic\KnownTypePolymorphicMessagePackSerializer`1.cs">
+      <Link>Serialization\Polymorphic\KnownTypePolymorphicMessagePackSerializer`1.cs</Link>
     </Compile>
     <Compile Include="..\MsgPack\Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs">
       <Link>Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs</Link>
     </Compile>
-    <Compile Include="..\MsgPack\Serialization\Polymorphic\TypeEmbedingPolymorhicMessagePackSerializer`1.cs">
-      <Link>Serialization\Polymorphic\TypeEmbedingPolymorhicMessagePackSerializer`1.cs</Link>
+    <Compile Include="..\MsgPack\Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs">
+      <Link>Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs</Link>
     </Compile>
     <Compile Include="..\MsgPack\Serialization\Polymorphic\TypeInfoEncoder.cs">
       <Link>Serialization\Polymorphic\TypeInfoEncoder.cs</Link>
diff --git a/src/MsgPack.Xamarin.Android/MsgPack.Xamarin.Android.csproj b/src/MsgPack.Xamarin.Android/MsgPack.Xamarin.Android.csproj
@@ -482,14 +482,14 @@
     <Compile Include="..\MsgPack\Serialization\Polymorphic\IPolymorphicHelperAttributes.cs">
       <Link>Serialization\Polymorphic\IPolymorphicHelperAttributes.cs</Link>
     </Compile>
-    <Compile Include="..\MsgPack\Serialization\Polymorphic\KnownTypePolymorhicMessagePackSerializer`1.cs">
-      <Link>Serialization\Polymorphic\KnownTypePolymorhicMessagePackSerializer`1.cs</Link>
+    <Compile Include="..\MsgPack\Serialization\Polymorphic\KnownTypePolymorphicMessagePackSerializer`1.cs">
+      <Link>Serialization\Polymorphic\KnownTypePolymorphicMessagePackSerializer`1.cs</Link>
     </Compile>
     <Compile Include="..\MsgPack\Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs">
       <Link>Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs</Link>
     </Compile>
-    <Compile Include="..\MsgPack\Serialization\Polymorphic\TypeEmbedingPolymorhicMessagePackSerializer`1.cs">
-      <Link>Serialization\Polymorphic\TypeEmbedingPolymorhicMessagePackSerializer`1.cs</Link>
+    <Compile Include="..\MsgPack\Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs">
+      <Link>Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs</Link>
     </Compile>
     <Compile Include="..\MsgPack\Serialization\Polymorphic\TypeInfoEncoder.cs">
       <Link>Serialization\Polymorphic\TypeInfoEncoder.cs</Link>
diff --git a/src/MsgPack.Xamarin.iOS/MsgPack.Xamarin.iOS.csproj b/src/MsgPack.Xamarin.iOS/MsgPack.Xamarin.iOS.csproj
@@ -476,14 +476,14 @@
     <Compile Include="..\MsgPack\Serialization\Polymorphic\IPolymorphicHelperAttributes.cs">
       <Link>Serialization\Polymorphic\IPolymorphicHelperAttributes.cs</Link>
     </Compile>
-    <Compile Include="..\MsgPack\Serialization\Polymorphic\KnownTypePolymorhicMessagePackSerializer`1.cs">
-      <Link>Serialization\Polymorphic\KnownTypePolymorhicMessagePackSerializer`1.cs</Link>
+    <Compile Include="..\MsgPack\Serialization\Polymorphic\KnownTypePolymorphicMessagePackSerializer`1.cs">
+      <Link>Serialization\Polymorphic\KnownTypePolymorphicMessagePackSerializer`1.cs</Link>
     </Compile>
     <Compile Include="..\MsgPack\Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs">
       <Link>Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs</Link>
     </Compile>
-    <Compile Include="..\MsgPack\Serialization\Polymorphic\TypeEmbedingPolymorhicMessagePackSerializer`1.cs">
-      <Link>Serialization\Polymorphic\TypeEmbedingPolymorhicMessagePackSerializer`1.cs</Link>
+    <Compile Include="..\MsgPack\Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs">
+      <Link>Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs</Link>
     </Compile>
     <Compile Include="..\MsgPack\Serialization\Polymorphic\TypeInfoEncoder.cs">
       <Link>Serialization\Polymorphic\TypeInfoEncoder.cs</Link>
diff --git a/src/MsgPack/MsgPack.csproj b/src/MsgPack/MsgPack.csproj
@@ -248,7 +248,7 @@
     <Compile Include="Serialization\Metadata\_DateTimeMessagePackSerializerHelpers.cs" />
     <Compile Include="Serialization\Polymorphic\IPolymorphicHelperAttributes.cs" />
     <Compile Include="Serialization\Polymorphic\IPolymorphicDeserializer.cs" />
-    <Compile Include="Serialization\Polymorphic\KnownTypePolymorhicMessagePackSerializer`1.cs" />
+    <Compile Include="Serialization\Polymorphic\KnownTypePolymorphicMessagePackSerializer`1.cs" />
     <Compile Include="Serialization\MessagePackDeserializationConstructorAttribute.cs" />
     <Compile Include="Serialization\MessagePackIgnoreAttribute.cs" />
     <Compile Include="Serialization\Metadata\_Decimal.cs" />
@@ -449,7 +449,7 @@
     <Compile Include="Serialization\DefaultSerializers\System_Collections_Specialized_NameValueCollectionMessagePackSerializer.cs" />
     <Compile Include="Serialization\Tracer.cs" />
     <Compile Include="Serialization\Polymorphic\TypeInfoEncoding.cs" />
-    <Compile Include="Serialization\Polymorphic\TypeEmbedingPolymorhicMessagePackSerializer`1.cs" />
+    <Compile Include="Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs" />
     <Compile Include="Serialization\Polymorphic\TypeInfoEncoder.cs" />
     <Compile Include="Serialization\ExtTypeCodeMapping.cs" />
     <Compile Include="Serialization\TypeKeyRepository.cs" />
diff --git a/src/MsgPack/Serialization/Polymorphic/KnownTypePolymorphicMessagePackSerializer`1.cs b/src/MsgPack/Serialization/Polymorphic/KnownTypePolymorphicMessagePackSerializer`1.cs
@@ -24,24 +24,25 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
 using System.Runtime.Serialization;
 
+using MsgPack.Serialization.Reflection;
+
 namespace MsgPack.Serialization.Polymorphic
 {
 	/// <summary>
 	///		Implements polymorphic serializer which uses closed known types and interoperable ext-type feature.
 	/// </summary>
 	/// <typeparam name="T">The base type of the polymorhic member.</typeparam>
-	internal sealed class KnownTypePolymorhicMessagePackSerializer<T> : MessagePackSerializer<T>, IPolymorphicDeserializer
+	internal sealed class KnownTypePolymorphicMessagePackSerializer<T> : MessagePackSerializer<T>, IPolymorphicDeserializer
 	{
 		private readonly PolymorphismSchema _schema;
 		private readonly IDictionary<string, RuntimeTypeHandle> _typeHandleMap;
 		private readonly IDictionary<RuntimeTypeHandle, string> _typeCodeMap;
 
-		public KnownTypePolymorhicMessagePackSerializer( SerializationContext ownerContext, PolymorphismSchema schema )
+		public KnownTypePolymorphicMessagePackSerializer( SerializationContext ownerContext, PolymorphismSchema schema )
 			: base( ownerContext )
 		{
 			if ( typeof( T ).GetIsValueType() )
@@ -105,6 +106,19 @@ private IMessagePackSerializer GetActualTypeSerializer( Type actualType )
 		[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA2202:DoNotDisposeObjectsMultipleTimes", Justification = "Avoided via ownsStream: false" )]
 		protected internal override void PackToCore( Packer packer, T objectTree )
 		{
+			string typeCode;
+			if ( !this._typeCodeMap.TryGetValue( objectTree.GetType().TypeHandle, out typeCode ) )
+			{
+				throw new SerializationException( 
+					String.Format( 
+						CultureInfo.CurrentCulture, 
+						"Type '{0}' in assembly '{1}' is not defined as known types.",
+						objectTree.GetType().GetFullName(), 
+						objectTree.GetType().GetAssembly()
+					) 
+				);
+			}
+
 			TypeInfoEncoder.Encode( this.OwnerContext, packer, this._typeCodeMap[ objectTree.GetType().TypeHandle ] );
 			this.GetActualTypeSerializer( objectTree.GetType() ).PackTo( packer, objectTree );
 		}
diff --git a/src/MsgPack/Serialization/Polymorphic/PolymorphicSerializerProvider`1.cs b/src/MsgPack/Serialization/Polymorphic/PolymorphicSerializerProvider`1.cs
@@ -65,11 +65,11 @@ public override object Get( SerializationContext context, object providerParamet
 
 			if ( schema.UseTypeEmbedding )
 			{
-				return new TypeEmbedingPolymorhicMessagePackSerializer<T>( context, schema );
+				return new TypeEmbedingPolymorphicMessagePackSerializer<T>( context, schema );
 			}
 			else
 			{
-				return new KnownTypePolymorhicMessagePackSerializer<T>( context, schema );
+				return new KnownTypePolymorphicMessagePackSerializer<T>( context, schema );
 			}
 		}
 	}
diff --git a/src/MsgPack/Serialization/Polymorphic/TypeEmbedingPolymorphicMessagePackSerializer`1.cs b/src/MsgPack/Serialization/Polymorphic/TypeEmbedingPolymorphicMessagePackSerializer`1.cs
@@ -28,11 +28,11 @@ namespace MsgPack.Serialization.Polymorphic
 	///		Implements polymorphic serializer which uses open types and non-interoperable ext-type tag and .NET type information.
 	/// </summary>
 	/// <typeparam name="T">The base type of the polymorhic member.</typeparam>
-	internal sealed class TypeEmbedingPolymorhicMessagePackSerializer<T> : MessagePackSerializer<T>, IPolymorphicDeserializer
+	internal sealed class TypeEmbedingPolymorphicMessagePackSerializer<T> : MessagePackSerializer<T>, IPolymorphicDeserializer
 	{
 		private readonly PolymorphismSchema _schema;
 
-		public TypeEmbedingPolymorhicMessagePackSerializer( SerializationContext ownerContext, PolymorphismSchema schema )
+		public TypeEmbedingPolymorphicMessagePackSerializer( SerializationContext ownerContext, PolymorphismSchema schema )
 			: base( ownerContext )
 		{
 			if ( typeof( T ).GetIsValueType() )
diff --git a/src/MsgPack/Serialization/Polymorphic/TypeInfoEncoder.cs b/src/MsgPack/Serialization/Polymorphic/TypeInfoEncoder.cs
@@ -187,7 +187,7 @@ public static Type DecodeRuntimeTypeInfo( Unpacker unpacker )
 							String.IsNullOrEmpty( culture )
 								? null
 #if !WINDOWS_PHONE && !SILVERLIGHT
- : CultureInfo.GetCultureInfo( culture ),
+						: CultureInfo.GetCultureInfo( culture ),
 #else
 								: new CultureInfo( culture ),
 #endif //  !WINDOWS_PHONE
