Merge branch 'rjperes-NH-3415'

Author: oskarb

src/NHibernate.Test/MappingByCode/ExplicitMappingTests/BasicMappingOfSimpleClass.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Collections;
+using System.Collections.Generic;
 using System.Linq;
 using NHibernate.Cfg.MappingSchema;
 using NHibernate.Mapping.ByCode;
@@ -32,6 +34,24 @@ public void MapClassWithIdAndProperty()
 			ModelIsWellFormed(hbmMapping);
 		}
 
+		[Test]
+		public void MapClassWithIdAndPropertyWithParamsDictionary()
+		{
+			var mapper = new ModelMapper();
+			mapper.Class<MyClass>(ca =>
+			{
+				ca.Id(x => x.Id, map =>
+				{
+					map.Column("MyClassId");
+					//NH-3415
+					map.Generator(Generators.HighLow, gmap => gmap.Params(new Dictionary<string, object> { { "max_low", 100 } }));
+				});
+				ca.Property(x => x.Something, map => map.Length(150));
+			});
+			var hbmMapping = mapper.CompileMappingFor(new[] { typeof(MyClass) });
+			ModelIsWellFormed(hbmMapping);
+		}
+
 		[Test]
 		public void WhenMapClassWithoutIdThenApplyTypeOfGeneratorDef()
 		{

src/NHibernate.sln.DotSettings

@@ -1,5 +1,6 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CommonFormatter/ALIGNMENT_TAB_FILL_STYLE/@EntryValue">USE_SPACES</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_LINQ_QUERY/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_ARGUMENT/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_CALLS_CHAIN/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_PARAMETER/@EntryValue">True</s:Boolean>

src/NHibernate/Mapping/ByCode/IGeneratorMapper.cs

@@ -1,7 +1,10 @@
+using System.Collections.Generic;
 namespace NHibernate.Mapping.ByCode
 {
 	public interface IGeneratorMapper
 	{
 		void Params(object generatorParameters);
+
+		void Params(IDictionary<string, object> generatorParameters);
 	}
 }

src/NHibernate/Mapping/ByCode/Impl/GeneratorMapper.cs

@@ -1,32 +1,43 @@
+using System.Collections.Generic;
 using System.Linq;
 using NHibernate.Cfg.MappingSchema;
 
 namespace NHibernate.Mapping.ByCode.Impl
 {
 	public class GeneratorMapper : IGeneratorMapper
 	{
-		private readonly HbmGenerator generator;
+		private readonly HbmGenerator _generator;
 
 		public GeneratorMapper(HbmGenerator generator)
 		{
-			this.generator = generator;
+			_generator = generator;
 		}
 
 		#region Implementation of IGeneratorMapper
 
 		public void Params(object generatorParameters)
+		{
+			var dictionary = generatorParameters.GetType()
+			                                    .GetProperties()
+			                                    .ToDictionary(x => x.Name, x => x.GetValue(generatorParameters, null));
+			Params(dictionary);
+		}
+
+		public void Params(IDictionary<string, object> generatorParameters)
 		{
 			if (generatorParameters == null)
 			{
 				return;
 			}
-			generator.param = (from pi in generatorParameters.GetType().GetProperties()
-			                   let pname = pi.Name
-			                   let pvalue = pi.GetValue(generatorParameters, null)
-			                   select
-			                   	new HbmParam
-			                   	{name = pname, Text = new[] {ReferenceEquals(pvalue, null) ? "null" : pvalue.ToString()}}).
-				ToArray();
+
+			_generator.param = (from pi in generatorParameters
+			                    let pname = pi.Key
+			                    let pvalue = pi.Value
+			                    select new HbmParam
+			                    {
+				                    name = pname,
+				                    Text = new[] {ReferenceEquals(pvalue, null) ? "null" : pvalue.ToString()}
+			                    }).ToArray();
 		}
 
 		#endregion