NH-3759

Author: rjperes

src/NHibernate.Test/MappingByCode/GeneratorTests.cs

@@ -26,13 +26,32 @@ public class I { public int Id { get; set; } }
 
 	public class GeneratorTests
 	{
+		[Test]
+		public void TestUUIDHexWithParameters()
+		{
+			//NH-3759
+			var mapper = new ModelMapper();
+
+			mapper.Class<A>(e => { e.Id(c => c.Id, c => c.Generator(Generators.UUIDHex("X", "."))); });
+			mapper.Class<B>(e => { e.Id(c => c.Id, c => c.Generator(Generators.UUIDHex("X"))); });
+
+			var hbmMapping = mapper.CompileMappingForAllExplicitlyAddedEntities();
+
+			var aGenerator = hbmMapping.RootClasses.Single(x => x.Name == typeof(A).Name).Id.generator;
+			Assert.AreEqual("X", aGenerator.param[0].Text[0]);
+			Assert.AreEqual(".", aGenerator.param[1].Text[0]);
+
+			var bGenerator = hbmMapping.RootClasses.Single(x => x.Name == typeof(B).Name).Id.generator;
+			Assert.AreEqual("X", bGenerator.param[0].Text[0]);
+		}
+
 		[Test]
 		public void TestGenerators()
 		{
 			var mapper = new ModelMapper();
 
 			mapper.Class<A>(e => { e.Id(c => c.Id, c => c.Generator(Generators.Counter)); });
-			mapper.Class<B>(e => { e.Id(c => c.Id, c => c.Generator(Generators.UUIDHex)); });
+			mapper.Class<B>(e => { e.Id(c => c.Id, c => c.Generator(Generators.UUIDHex())); });
 			mapper.Class<C>(e => { e.Id(c => c.Id, c => c.Generator(Generators.UUIDString)); });
 			mapper.Class<D>(e => { e.Id(c => c.Id, c => c.Generator(Generators.Increment)); });
 			mapper.Class<E>(e => { e.Id(c => c.Id, c => c.Generator(Generators.Select)); });
@@ -43,7 +62,7 @@ public void TestGenerators()
 
 			var hbmMapping = mapper.CompileMappingForAllExplicitlyAddedEntities();
 			Assert.AreEqual(hbmMapping.RootClasses.Single(x => x.Name == typeof(A).Name).Id.generator.@class, Generators.Counter.Class);
-			Assert.AreEqual(hbmMapping.RootClasses.Single(x => x.Name == typeof(B).Name).Id.generator.@class, Generators.UUIDHex.Class);
+			Assert.AreEqual(hbmMapping.RootClasses.Single(x => x.Name == typeof(B).Name).Id.generator.@class, Generators.UUIDHex().Class);
 			Assert.AreEqual(hbmMapping.RootClasses.Single(x => x.Name == typeof(C).Name).Id.generator.@class, Generators.UUIDString.Class);
 			Assert.AreEqual(hbmMapping.RootClasses.Single(x => x.Name == typeof(D).Name).Id.generator.@class, Generators.Increment.Class);
 			Assert.AreEqual(hbmMapping.RootClasses.Single(x => x.Name == typeof(E).Name).Id.generator.@class, Generators.Select.Class);

src/NHibernate/Mapping/ByCode/Generators.cs

@@ -25,7 +25,6 @@ static Generators()
 			SequenceIdentity = new SequenceIdentityGeneratorDef();
 			Table = new TableGeneratorDef();
 			TriggerIdentity = new TriggerIdentityGeneratorDef();
-			UUIDHex = new UUIDHexGeneratorDef();
 			UUIDString = new UUIDStringGeneratorDef();
 		}
 
@@ -46,7 +45,22 @@ static Generators()
 		public static IGeneratorDef Table { get; private set; }
 		public static IGeneratorDef TriggerIdentity { get; private set; }
 		public static IGeneratorDef SequenceIdentity { get; private set; }
-		public static IGeneratorDef UUIDHex { get; private set; }
+
+		public static IGeneratorDef UUIDHex()
+		{
+			return new UUIDHexGeneratorDef(); 
+		}
+
+		public static IGeneratorDef UUIDHex(string format)
+		{
+			return new UUIDHexGeneratorDef(format); 
+		}
+
+		public static IGeneratorDef UUIDHex(string format, string separator)
+		{
+			return new UUIDHexGeneratorDef(format, separator); 
+		}
+
 		public static IGeneratorDef UUIDString { get; private set; }
 
 		public static IGeneratorDef Foreign<TEntity>(Expression<Func<TEntity, object>> property)
@@ -110,7 +124,7 @@ public UUIDHexGeneratorDef(string format, string separator)
 				throw new ArgumentNullException("format");
 			if (separator == null)
 				throw new ArgumentNullException("separator");
-			param = new { format = format, seperator = separator };
+			param = new { format = format, separator = separator };
 		}
 
 		public string Class