Skip to content

Commit d942c57

Browse files
maca88maca88
committed
Renamed to IExpressionTransformerRegistrar
1 parent 4f4d662 commit d942c57

File tree

8 files changed

+30
-30
lines changed

8 files changed

+30
-30
lines changed

‎doc/reference/modules/configuration.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -705,14 +705,14 @@ var session = sessions.OpenSession(conn);
705705
</row>
706706
<row>
707707
<entry>
708-
<literal>query.pre_transformer_initializer</literal>
708+
<literal>query.pre_transformer_registrar</literal>
709709
</entry>
710710
<entry>
711-
The class name of the LINQ query pre-transformer initializer, implementing
712-
<literal>IExpressionTransformerInitializer</literal>. Defaults to <literal>null</literal> (no initialzer).
711+
The class name of the LINQ query pre-transformer registrar, implementing
712+
<literal>IExpressionTransformerRegistrar</literal>. Defaults to <literal>null</literal> (no registrar).
713713
<para>
714714
<emphasis role="strong">eg.</emphasis>
715-
<literal>classname.of.ExpressionTransformerInitializer, assembly</literal>
715+
<literal>classname.of.ExpressionTransformerRegistrar, assembly</literal>
716716
</para>
717717
</entry>
718718
</row>

‎src/NHibernate.Test/Async/Linq/CustomPreTransformInitializerTests.cs renamed to ‎src/NHibernate.Test/Async/Linq/CustomExpressionTransformerRegistrarTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ namespace NHibernate.Test.Linq
2323
{
2424
using System.Threading.Tasks;
2525
[TestFixture]
26-
public class CustomPreTransformInitializerTestsAsync : LinqTestCase
26+
public class CustomPreTransformRegistrarTestsAsync : LinqTestCase
2727
{
2828
protected override void Configure(Cfg.Configuration configuration)
2929
{
30-
configuration.Properties[Cfg.Environment.PreTransformerInitializer] = typeof(PreTransformerInitializer).AssemblyQualifiedName;
30+
configuration.Properties[Cfg.Environment.PreTransformerRegistrar] = typeof(PreTransformerRegistrar).AssemblyQualifiedName;
3131
}
3232

3333
[Test]
@@ -45,9 +45,9 @@ public async Task RewriteLikeAsync()
4545
}
4646

4747
[Serializable]
48-
public class PreTransformerInitializer : IExpressionTransformerInitializer
48+
public class PreTransformerRegistrar : IExpressionTransformerRegistrar
4949
{
50-
public void Initialize(ExpressionTransformerRegistry expressionTransformerRegistry)
50+
public void Register(ExpressionTransformerRegistry expressionTransformerRegistry)
5151
{
5252
expressionTransformerRegistry.Register(new LikeTransformer());
5353
}

‎src/NHibernate.Test/Linq/CustomPreTransformInitializerTests.cs renamed to ‎src/NHibernate.Test/Linq/CustomExpressionTransformerRegistrarTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
namespace NHibernate.Test.Linq
1313
{
1414
[TestFixture]
15-
public class CustomPreTransformInitializerTests : LinqTestCase
15+
public class CustomPreTransformRegistrarTests : LinqTestCase
1616
{
1717
protected override void Configure(Cfg.Configuration configuration)
1818
{
19-
configuration.Properties[Cfg.Environment.PreTransformerInitializer] = typeof(PreTransformerInitializer).AssemblyQualifiedName;
19+
configuration.Properties[Cfg.Environment.PreTransformerRegistrar] = typeof(PreTransformerRegistrar).AssemblyQualifiedName;
2020
}
2121

2222
[Test]
@@ -34,9 +34,9 @@ public void RewriteLike()
3434
}
3535

3636
[Serializable]
37-
public class PreTransformerInitializer : IExpressionTransformerInitializer
37+
public class PreTransformerRegistrar : IExpressionTransformerRegistrar
3838
{
39-
public void Initialize(ExpressionTransformerRegistry expressionTransformerRegistry)
39+
public void Register(ExpressionTransformerRegistry expressionTransformerRegistry)
4040
{
4141
expressionTransformerRegistry.Register(new LikeTransformer());
4242
}

‎src/NHibernate/Cfg/Environment.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,9 +278,9 @@ public static string Version
278278
public const string QueryModelRewriterFactory = "query.query_model_rewriter_factory";
279279

280280
/// <summary>
281-
/// The class name of the LINQ query pre-transformer initializer, implementing <see cref="IExpressionTransformerInitializer"/>.
281+
/// The class name of the LINQ query pre-transformer registrar, implementing <see cref="IExpressionTransformerRegistrar"/>.
282282
/// </summary>
283-
public const string PreTransformerInitializer = "query.pre_transformer_initializer";
283+
public const string PreTransformerRegistrar = "query.pre_transformer_registrar";
284284

285285
/// <summary>
286286
/// Set the default length used in casting when the target type is length bound and

‎src/NHibernate/Cfg/Settings.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,9 @@ public Settings()
185185
public IQueryModelRewriterFactory QueryModelRewriterFactory { get; internal set; }
186186

187187
/// <summary>
188-
/// The pre-transformer initializer used to register custom expression transformers.
188+
/// The pre-transformer registrar used to register custom expression transformers.
189189
/// </summary>
190-
public IExpressionTransformerInitializer PreTransformerInitializer { get; internal set; }
190+
public IExpressionTransformerRegistrar PreTransformerRegistrar { get; internal set; }
191191

192192
internal IExpressionTreeProcessor LinqPreTransformer { get; set; }
193193

‎src/NHibernate/Cfg/SettingsFactory.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -312,8 +312,8 @@ public Settings BuildSettings(IDictionary<string, string> properties)
312312
// Not ported - JdbcBatchVersionedData
313313

314314
settings.QueryModelRewriterFactory = CreateQueryModelRewriterFactory(properties);
315-
settings.PreTransformerInitializer = CreatePreTransformerInitializer(properties);
316-
settings.LinqPreTransformer = CreateLinqPreTransformer(settings.PreTransformerInitializer);
315+
settings.PreTransformerRegistrar = CreatePreTransformerRegistrar(properties);
316+
settings.LinqPreTransformer = CreateLinqPreTransformer(settings.PreTransformerRegistrar);
317317

318318
// NHibernate-specific:
319319
settings.IsolationLevel = isolation;
@@ -449,33 +449,33 @@ private static IQueryModelRewriterFactory CreateQueryModelRewriterFactory(IDicti
449449
}
450450
}
451451

452-
private static IExpressionTransformerInitializer CreatePreTransformerInitializer(IDictionary<string, string> properties)
452+
private static IExpressionTransformerRegistrar CreatePreTransformerRegistrar(IDictionary<string, string> properties)
453453
{
454-
var className = PropertiesHelper.GetString(Environment.PreTransformerInitializer, properties, null);
454+
var className = PropertiesHelper.GetString(Environment.PreTransformerRegistrar, properties, null);
455455
if (className == null)
456456
return null;
457457

458-
log.Info("Pre-transformer initializer: {0}", className);
458+
log.Info("Pre-transformer registrar: {0}", className);
459459

460460
try
461461
{
462462
return
463-
(IExpressionTransformerInitializer)
463+
(IExpressionTransformerRegistrar)
464464
Environment.ObjectsFactory.CreateInstance(ReflectHelper.ClassForName(className));
465465
}
466466
catch (Exception e)
467467
{
468-
throw new HibernateException("could not instantiate IExpressionTransformerInitializer: " + className, e);
468+
throw new HibernateException("could not instantiate IExpressionTransformerRegistrar: " + className, e);
469469
}
470470
}
471471

472-
private static IExpressionTreeProcessor CreateLinqPreTransformer(IExpressionTransformerInitializer expressionTransformerInitializer)
472+
private static IExpressionTreeProcessor CreateLinqPreTransformer(IExpressionTransformerRegistrar expressionTransformerRegistrar)
473473
{
474474
var preTransformerRegistry = new ExpressionTransformerRegistry();
475475
// NH-3247: must remove .Net compiler char to int conversion before
476476
// parameterization occurs.
477477
preTransformerRegistry.Register(new RemoveCharToIntConversion());
478-
expressionTransformerInitializer?.Initialize(preTransformerRegistry);
478+
expressionTransformerRegistrar?.Register(preTransformerRegistry);
479479

480480
return new TransformingExpressionTreeProcessor(preTransformerRegistry);
481481
}

‎src/NHibernate/Linq/Visitors/IExpressionTransformerInitializer.cs renamed to ‎src/NHibernate/Linq/Visitors/IExpressionTransformerRegistrar.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ namespace NHibernate.Linq.Visitors
55
/// <summary>
66
/// Provides a way to register custom transformers for expressions.
77
/// </summary>
8-
public interface IExpressionTransformerInitializer
8+
public interface IExpressionTransformerRegistrar
99
{
1010
/// <summary>
11-
/// Initialize expression transformer registry by registering additional transformers.
11+
/// Registers additional transformers on the expression transformer registry.
1212
/// </summary>
1313
/// <param name="expressionTransformerRegistry">The expression transformer registry.</param>
14-
void Initialize(ExpressionTransformerRegistry expressionTransformerRegistry);
14+
void Register(ExpressionTransformerRegistry expressionTransformerRegistry);
1515
}
1616
}

‎src/NHibernate/nhibernate-configuration.xsd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,10 @@
151151
<xs:enumeration value="order_inserts" />
152152
<xs:enumeration value="order_updates" />
153153
<xs:enumeration value="query.query_model_rewriter_factory" />
154-
<xs:enumeration value="query.pre_transformer_initializer">
154+
<xs:enumeration value="query.pre_transformer_registrar">
155155
<xs:annotation>
156156
<xs:documentation>
157-
The pre-transformer initializer used to register custom expression transformers.
157+
The pre-transformer registrar used to register custom expression transformers.
158158
</xs:documentation>
159159
</xs:annotation>
160160
</xs:enumeration>

0 commit comments

Comments
 (0)