Skip to content

Commit da77cf3

Browse files
ngbrownngbrown
committed
InternalLogLevel and InternalLogValues are renamed to NHibernateLogLevel and NHibernateLogValues
1 parent 168cece commit da77cf3

File tree

5 files changed

+73
-73
lines changed

5 files changed

+73
-73
lines changed

‎src/NHibernate.Example.Web/Infrastructure/NHibernateToMicrosoftLogger.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@ public NHibernateToMicrosoftLogger(ILogger msLogger)
1414
_msLogger = msLogger ?? throw new ArgumentNullException(nameof(msLogger));
1515
}
1616

17-
private static readonly Dictionary<InternalLogLevel, LogLevel> MapLevels = new Dictionary<InternalLogLevel, LogLevel>
17+
private static readonly Dictionary<NHibernateLogLevel, LogLevel> MapLevels = new Dictionary<NHibernateLogLevel, LogLevel>
1818
{
19-
{ InternalLogLevel.Trace, LogLevel.Trace },
20-
{ InternalLogLevel.Debug, LogLevel.Debug },
21-
{ InternalLogLevel.Warn, LogLevel.Warning },
22-
{ InternalLogLevel.Error, LogLevel.Error },
23-
{ InternalLogLevel.Fatal, LogLevel.Critical },
24-
{ InternalLogLevel.None, LogLevel.None },
19+
{ NHibernateLogLevel.Trace, LogLevel.Trace },
20+
{ NHibernateLogLevel.Debug, LogLevel.Debug },
21+
{ NHibernateLogLevel.Warn, LogLevel.Warning },
22+
{ NHibernateLogLevel.Error, LogLevel.Error },
23+
{ NHibernateLogLevel.Fatal, LogLevel.Critical },
24+
{ NHibernateLogLevel.None, LogLevel.None },
2525
};
2626

27-
public void Log(InternalLogLevel logLevel, InternalLogValues state, Exception exception)
27+
public void Log(NHibernateLogLevel logLevel, NHibernateLogValues state, Exception exception)
2828
{
2929
_msLogger.Log(MapLevels[logLevel], 0, new FormattedLogValues(state.Format, state.Args), exception, MessageFormatter);
3030
}
3131

32-
public bool IsEnabled(InternalLogLevel logLevel)
32+
public bool IsEnabled(NHibernateLogLevel logLevel)
3333
{
3434
return _msLogger.IsEnabled(MapLevels[logLevel]);
3535
}

‎src/NHibernate.Test/Logging/LoggerPerformanceTest.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ private class MockLogger2 : INHibernateLogger
128128
private bool IsInfoEnabled { get; } = false;
129129
private bool IsWarnEnabled { get; } = true;
130130

131-
public void Log(InternalLogLevel logLevel, InternalLogValues state, Exception exception)
131+
public void Log(NHibernateLogLevel logLevel, NHibernateLogValues state, Exception exception)
132132
{
133133
if (!IsEnabled(logLevel)) return;
134134

@@ -142,22 +142,22 @@ public void Log(InternalLogLevel logLevel, InternalLogValues state, Exception ex
142142
}
143143
}
144144

145-
public bool IsEnabled(InternalLogLevel logLevel)
145+
public bool IsEnabled(NHibernateLogLevel logLevel)
146146
{
147147
switch (logLevel)
148148
{
149-
case InternalLogLevel.Trace:
150-
case InternalLogLevel.Debug:
149+
case NHibernateLogLevel.Trace:
150+
case NHibernateLogLevel.Debug:
151151
return IsDebugEnabled;
152-
case InternalLogLevel.Info:
152+
case NHibernateLogLevel.Info:
153153
return IsInfoEnabled;
154-
case InternalLogLevel.Warn:
154+
case NHibernateLogLevel.Warn:
155155
return IsWarnEnabled;
156-
case InternalLogLevel.Error:
156+
case NHibernateLogLevel.Error:
157157
return IsErrorEnabled;
158-
case InternalLogLevel.Fatal:
158+
case NHibernateLogLevel.Fatal:
159159
return IsFatalEnabled;
160-
case InternalLogLevel.None:
160+
case NHibernateLogLevel.None:
161161
return !IsFatalEnabled;
162162
default:
163163
throw new ArgumentOutOfRangeException(nameof(logLevel), logLevel, null);

‎src/NHibernate/Logging.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ public interface INHibernateLogger
1111
/// <param name="logLevel">Entry will be written on this level.</param>
1212
/// <param name="state">The entry to be written.</param>
1313
/// <param name="exception">The exception related to this entry.</param>
14-
void Log(InternalLogLevel logLevel, InternalLogValues state, Exception exception);
14+
void Log(NHibernateLogLevel logLevel, NHibernateLogValues state, Exception exception);
1515

1616
/// <summary>
1717
/// Checks if the given <paramref name="logLevel" /> is enabled.
1818
/// </summary>
1919
/// <param name="logLevel">level to be checked.</param>
2020
/// <returns><c>true</c> if enabled.</returns>
21-
bool IsEnabled(InternalLogLevel logLevel);
21+
bool IsEnabled(NHibernateLogLevel logLevel);
2222
}
2323

2424
/// <summary>
@@ -177,29 +177,29 @@ public INHibernateLogger LoggerFor(System.Type type)
177177

178178
internal class NoLoggingNHibernateLogger: INHibernateLogger
179179
{
180-
public void Log(InternalLogLevel logLevel, InternalLogValues state, Exception exception)
180+
public void Log(NHibernateLogLevel logLevel, NHibernateLogValues state, Exception exception)
181181
{
182182
}
183183

184-
public bool IsEnabled(InternalLogLevel logLevel)
184+
public bool IsEnabled(NHibernateLogLevel logLevel)
185185
{
186-
if (logLevel == InternalLogLevel.None) return true;
186+
if (logLevel == NHibernateLogLevel.None) return true;
187187

188188
return false;
189189
}
190190
}
191191

192-
public struct InternalLogValues
192+
public struct NHibernateLogValues
193193
{
194194
private readonly string _format;
195195
private readonly object[] _args;
196196

197197
/// <summary>
198-
/// Instantiates a new instance of the <see cref="InternalLogValues"/> structure.
198+
/// Instantiates a new instance of the <see cref="NHibernateLogValues"/> structure.
199199
/// </summary>
200200
/// <param name="format">a composite format string</param>
201201
/// <param name="args">An object array that contains zero or more objects to format. Can be <c>null</c> if there are no values to format.</param>
202-
public InternalLogValues(string format, object[] args)
202+
public NHibernateLogValues(string format, object[] args)
203203
{
204204
_format = format ?? "[Null]";
205205
_args = args;
@@ -232,7 +232,7 @@ public override string ToString()
232232
}
233233

234234
/// <summary>Defines logging severity levels.</summary>
235-
public enum InternalLogLevel
235+
public enum NHibernateLogLevel
236236
{
237237
Trace,
238238
Debug,

‎src/NHibernate/Logging.NHibernateLoggerExtensions.cs renamed to ‎src/NHibernate/Logging.extensions.cs

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,110 +7,110 @@ namespace NHibernate
77
/// </summary>
88
public static class NHibernateLoggerExtensions
99
{
10-
public static bool IsDebugEnabled(this INHibernateLogger logger) => logger.IsEnabled(InternalLogLevel.Debug);
11-
public static bool IsInfoEnabled(this INHibernateLogger logger) => logger.IsEnabled(InternalLogLevel.Info);
12-
public static bool IsWarnEnabled(this INHibernateLogger logger) => logger.IsEnabled(InternalLogLevel.Warn);
13-
public static bool IsErrorEnabled(this INHibernateLogger logger) => logger.IsEnabled(InternalLogLevel.Error);
14-
public static bool IsFatalEnabled(this INHibernateLogger logger) => logger.IsEnabled(InternalLogLevel.Fatal);
10+
public static bool IsDebugEnabled(this INHibernateLogger logger) => logger.IsEnabled(NHibernateLogLevel.Debug);
11+
public static bool IsInfoEnabled(this INHibernateLogger logger) => logger.IsEnabled(NHibernateLogLevel.Info);
12+
public static bool IsWarnEnabled(this INHibernateLogger logger) => logger.IsEnabled(NHibernateLogLevel.Warn);
13+
public static bool IsErrorEnabled(this INHibernateLogger logger) => logger.IsEnabled(NHibernateLogLevel.Error);
14+
public static bool IsFatalEnabled(this INHibernateLogger logger) => logger.IsEnabled(NHibernateLogLevel.Fatal);
1515

1616
public static void Fatal(this INHibernateLogger logger, Exception exception, string format, params object[] args)
1717
{
18-
logger.Log(InternalLogLevel.Fatal, new InternalLogValues(format, args), exception);
18+
logger.Log(NHibernateLogLevel.Fatal, new NHibernateLogValues(format, args), exception);
1919
}
2020

2121
public static void Fatal(this INHibernateLogger logger, Exception exception, string format)
2222
{
23-
logger.Log(InternalLogLevel.Fatal, new InternalLogValues(format, null), exception);
23+
logger.Log(NHibernateLogLevel.Fatal, new NHibernateLogValues(format, null), exception);
2424
}
2525

2626
public static void Fatal(this INHibernateLogger logger, string format, params object[] args)
2727
{
28-
logger.Log(InternalLogLevel.Fatal, new InternalLogValues(format, args), null);
28+
logger.Log(NHibernateLogLevel.Fatal, new NHibernateLogValues(format, args), null);
2929
}
3030

3131
public static void Fatal(this INHibernateLogger logger, string format)
3232
{
33-
logger.Log(InternalLogLevel.Fatal, new InternalLogValues(format, null), null);
33+
logger.Log(NHibernateLogLevel.Fatal, new NHibernateLogValues(format, null), null);
3434
}
3535

3636
public static void Error(this INHibernateLogger logger, Exception exception, string format, params object[] args)
3737
{
38-
logger.Log(InternalLogLevel.Error, new InternalLogValues(format, args), exception);
38+
logger.Log(NHibernateLogLevel.Error, new NHibernateLogValues(format, args), exception);
3939
}
4040

4141
public static void Error(this INHibernateLogger logger, Exception exception, string format)
4242
{
43-
logger.Log(InternalLogLevel.Error, new InternalLogValues(format, null), exception);
43+
logger.Log(NHibernateLogLevel.Error, new NHibernateLogValues(format, null), exception);
4444
}
4545

4646
public static void Error(this INHibernateLogger logger, string format, params object[] args)
4747
{
48-
logger.Log(InternalLogLevel.Error, new InternalLogValues(format, args), null);
48+
logger.Log(NHibernateLogLevel.Error, new NHibernateLogValues(format, args), null);
4949
}
5050

5151
public static void Error(this INHibernateLogger logger, string format)
5252
{
53-
logger.Log(InternalLogLevel.Error, new InternalLogValues(format, null), null);
53+
logger.Log(NHibernateLogLevel.Error, new NHibernateLogValues(format, null), null);
5454
}
5555

5656
public static void Warn(this INHibernateLogger logger, Exception exception, string format, params object[] args)
5757
{
58-
logger.Log(InternalLogLevel.Warn, new InternalLogValues(format, args), exception);
58+
logger.Log(NHibernateLogLevel.Warn, new NHibernateLogValues(format, args), exception);
5959
}
6060

6161
public static void Warn(this INHibernateLogger logger, Exception exception, string format)
6262
{
63-
logger.Log(InternalLogLevel.Warn, new InternalLogValues(format, null), exception);
63+
logger.Log(NHibernateLogLevel.Warn, new NHibernateLogValues(format, null), exception);
6464
}
6565

6666
public static void Warn(this INHibernateLogger logger, string format, params object[] args)
6767
{
68-
logger.Log(InternalLogLevel.Warn, new InternalLogValues(format, args), null);
68+
logger.Log(NHibernateLogLevel.Warn, new NHibernateLogValues(format, args), null);
6969
}
7070

7171
public static void Warn(this INHibernateLogger logger, string format)
7272
{
73-
logger.Log(InternalLogLevel.Warn, new InternalLogValues(format, null), null);
73+
logger.Log(NHibernateLogLevel.Warn, new NHibernateLogValues(format, null), null);
7474
}
7575

7676
public static void Info(this INHibernateLogger logger, Exception exception, string format, params object[] args)
7777
{
78-
logger.Log(InternalLogLevel.Info, new InternalLogValues(format, args), exception);
78+
logger.Log(NHibernateLogLevel.Info, new NHibernateLogValues(format, args), exception);
7979
}
8080

8181
public static void Info(this INHibernateLogger logger, Exception exception, string format)
8282
{
83-
logger.Log(InternalLogLevel.Info, new InternalLogValues(format, null), exception);
83+
logger.Log(NHibernateLogLevel.Info, new NHibernateLogValues(format, null), exception);
8484
}
8585

8686
public static void Info(this INHibernateLogger logger, string format, params object[] args)
8787
{
88-
logger.Log(InternalLogLevel.Info, new InternalLogValues(format, args), null);
88+
logger.Log(NHibernateLogLevel.Info, new NHibernateLogValues(format, args), null);
8989
}
9090

9191
public static void Info(this INHibernateLogger logger, string format)
9292
{
93-
logger.Log(InternalLogLevel.Info, new InternalLogValues(format, null), null);
93+
logger.Log(NHibernateLogLevel.Info, new NHibernateLogValues(format, null), null);
9494
}
9595

9696
public static void Debug(this INHibernateLogger logger, Exception exception, string format, params object[] args)
9797
{
98-
logger.Log(InternalLogLevel.Debug, new InternalLogValues(format, args), exception);
98+
logger.Log(NHibernateLogLevel.Debug, new NHibernateLogValues(format, args), exception);
9999
}
100100

101101
public static void Debug(this INHibernateLogger logger, Exception exception, string format)
102102
{
103-
logger.Log(InternalLogLevel.Debug, new InternalLogValues(format, null), exception);
103+
logger.Log(NHibernateLogLevel.Debug, new NHibernateLogValues(format, null), exception);
104104
}
105105

106106
public static void Debug(this INHibernateLogger logger, string format, params object[] args)
107107
{
108-
logger.Log(InternalLogLevel.Debug, new InternalLogValues(format, args), null);
108+
logger.Log(NHibernateLogLevel.Debug, new NHibernateLogValues(format, args), null);
109109
}
110110

111111
public static void Debug(this INHibernateLogger logger, string format)
112112
{
113-
logger.Log(InternalLogLevel.Debug, new InternalLogValues(format, null), null);
113+
logger.Log(NHibernateLogLevel.Debug, new NHibernateLogValues(format, null), null);
114114
}
115115

116116

‎src/NHibernate/Logging.obsolete.cs

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -167,75 +167,75 @@ public NHibernateLoggerThunk(IInternalLogger internalLogger)
167167
_internalLogger = internalLogger ?? throw new ArgumentNullException(nameof(internalLogger));
168168
}
169169

170-
public void Log(InternalLogLevel logLevel, InternalLogValues state, Exception exception)
170+
public void Log(NHibernateLogLevel logLevel, NHibernateLogValues state, Exception exception)
171171
{
172172
if (!IsEnabled(logLevel))
173173
return;
174174

175175
switch (logLevel)
176176
{
177-
case InternalLogLevel.Debug:
178-
case InternalLogLevel.Trace:
177+
case NHibernateLogLevel.Debug:
178+
case NHibernateLogLevel.Trace:
179179
if (exception != null)
180180
_internalLogger.Debug(state, exception);
181181
else if (state.Args?.Length > 0)
182182
_internalLogger.DebugFormat(state.Format, state.Args);
183183
else
184184
_internalLogger.Debug(state);
185185
break;
186-
case InternalLogLevel.Info:
186+
case NHibernateLogLevel.Info:
187187
if (exception != null)
188188
_internalLogger.Info(state, exception);
189189
else if (state.Args?.Length > 0)
190190
_internalLogger.InfoFormat(state.Format, state.Args);
191191
else
192192
_internalLogger.Info(state);
193193
break;
194-
case InternalLogLevel.Warn:
194+
case NHibernateLogLevel.Warn:
195195
if (exception != null)
196196
_internalLogger.Warn(state, exception);
197197
else if (state.Args?.Length > 0)
198198
_internalLogger.WarnFormat(state.Format, state.Args);
199199
else
200200
_internalLogger.Warn(state);
201201
break;
202-
case InternalLogLevel.Error:
202+
case NHibernateLogLevel.Error:
203203
if (exception != null)
204204
_internalLogger.Error(state, exception);
205205
else if (state.Args?.Length > 0)
206206
_internalLogger.ErrorFormat(state.Format, state.Args);
207207
else
208208
_internalLogger.Error(state);
209209
break;
210-
case InternalLogLevel.Fatal:
210+
case NHibernateLogLevel.Fatal:
211211
if (exception != null)
212212
_internalLogger.Fatal(state, exception);
213213
else
214214
_internalLogger.Fatal(state);
215215
break;
216-
case InternalLogLevel.None:
216+
case NHibernateLogLevel.None:
217217
break;
218218
default:
219219
throw new ArgumentOutOfRangeException(nameof(logLevel), logLevel, null);
220220
}
221221
}
222222

223-
public bool IsEnabled(InternalLogLevel logLevel)
223+
public bool IsEnabled(NHibernateLogLevel logLevel)
224224
{
225225
switch (logLevel)
226226
{
227-
case InternalLogLevel.Trace:
228-
case InternalLogLevel.Debug:
227+
case NHibernateLogLevel.Trace:
228+
case NHibernateLogLevel.Debug:
229229
return _internalLogger.IsDebugEnabled;
230-
case InternalLogLevel.Info:
230+
case NHibernateLogLevel.Info:
231231
return _internalLogger.IsInfoEnabled;
232-
case InternalLogLevel.Warn:
232+
case NHibernateLogLevel.Warn:
233233
return _internalLogger.IsWarnEnabled;
234-
case InternalLogLevel.Error:
234+
case NHibernateLogLevel.Error:
235235
return _internalLogger.IsErrorEnabled;
236-
case InternalLogLevel.Fatal:
236+
case NHibernateLogLevel.Fatal:
237237
return _internalLogger.IsFatalEnabled;
238-
case InternalLogLevel.None:
238+
case NHibernateLogLevel.None:
239239
return !_internalLogger.IsFatalEnabled;
240240
default:
241241
throw new ArgumentOutOfRangeException(nameof(logLevel), logLevel, null);
@@ -249,11 +249,11 @@ internal class InternalLoggerThunk : IInternalLogger
249249
{
250250
private readonly INHibernateLogger _nhibernateLogger;
251251

252-
public bool IsErrorEnabled => _nhibernateLogger.IsEnabled(InternalLogLevel.Error);
253-
public bool IsFatalEnabled => _nhibernateLogger.IsEnabled(InternalLogLevel.Fatal);
254-
public bool IsDebugEnabled => _nhibernateLogger.IsEnabled(InternalLogLevel.Debug);
255-
public bool IsInfoEnabled => _nhibernateLogger.IsEnabled(InternalLogLevel.Info);
256-
public bool IsWarnEnabled => _nhibernateLogger.IsEnabled(InternalLogLevel.Warn);
252+
public bool IsErrorEnabled => _nhibernateLogger.IsEnabled(NHibernateLogLevel.Error);
253+
public bool IsFatalEnabled => _nhibernateLogger.IsEnabled(NHibernateLogLevel.Fatal);
254+
public bool IsDebugEnabled => _nhibernateLogger.IsEnabled(NHibernateLogLevel.Debug);
255+
public bool IsInfoEnabled => _nhibernateLogger.IsEnabled(NHibernateLogLevel.Info);
256+
public bool IsWarnEnabled => _nhibernateLogger.IsEnabled(NHibernateLogLevel.Warn);
257257

258258
public InternalLoggerThunk(INHibernateLogger nhibernateLogger)
259259
{

0 commit comments

Comments
 (0)