Skip to content

Commit 47571ec

Browse files
claudiamurialdoclaudiamurialdo
committed
Remove unneeded reflection for GXLoggerFactory.GetLogger.
1 parent 026d74a commit 47571ec

File tree

19 files changed

+83
-88
lines changed

19 files changed

+83
-88
lines changed

‎dotnet/src/dotnetframework/GxClasses/Configuration/ExternalStorage.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class ExternalStorage : GxStorageProvider
1515

1616
private GXService providerService;
1717

18-
static readonly IGXLogger logger = GXLoggerFactory.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType.FullName);
18+
static readonly IGXLogger logger = GXLoggerFactory.GetLogger<ExternalStorage>();
1919

2020
public ExternalStorage()
2121
{

‎dotnet/src/dotnetframework/GxClasses/Data/GXDataDb2.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ protected override string BuildConnectionString(string datasourceName, string us
115115
public class GxDb2 : GxDataRecord
116116
{
117117

118-
private static readonly IGXLogger log = GXLoggerFactory.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType.FullName);
118+
private static readonly IGXLogger log = GXLoggerFactory.GetLogger<GxDb2>();
119119

120120
public static string SQL_NULL_DATE_10="0000-00-00";
121121
public static string SQL_NULL_DATE_8="00000000";
@@ -523,7 +523,7 @@ sealed internal class Db2ConnectionWrapper : GxAbstractConnectionWrapper
523523
private static int changeConnState=-1;
524524
private static int changeConnStateExecuting = -1;
525525
private int openDataReaders;
526-
static readonly IGXLogger log = GXLoggerFactory.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType.FullName);
526+
static readonly IGXLogger log = GXLoggerFactory.GetLogger<Db2ConnectionWrapper>();
527527
public Db2ConnectionWrapper()
528528
{
529529
try

‎dotnet/src/dotnetframework/GxClasses/Data/GXDataDb2400.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public override object GetValue(int i)
4444
}
4545
sealed internal class Db2ISeriesConnectionWrapper : GxAbstractConnectionWrapper
4646
{
47-
static readonly IGXLogger log = GXLoggerFactory.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType.FullName);
47+
static readonly IGXLogger log = GXLoggerFactory.GetLogger<Db2ISeriesConnectionWrapper>();
4848
public Db2ISeriesConnectionWrapper()
4949
{
5050
try
@@ -120,7 +120,7 @@ public override DbDataAdapter CreateDataAdapter()
120120
public class GxDb2ISeries : GxDataRecord
121121
{
122122

123-
static readonly IGXLogger log = GXLoggerFactory.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType.FullName);
123+
static readonly IGXLogger log = GXLoggerFactory.GetLogger<GxDb2ISeries>();
124124
private bool m_UseCharInDate;
125125
public static string SQL_NULL_DATE="00000000";
126126
private string m_InitialCatalog;
@@ -767,7 +767,7 @@ public override string ToDbmsConstant(DateTime Value)
767767
}
768768
sealed internal class Db2ISeriesHISConnectionWrapper : GxAbstractConnectionWrapper
769769
{
770-
static readonly IGXLogger log = GXLoggerFactory.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType.FullName);
770+
static readonly IGXLogger log = GXLoggerFactory.GetLogger<Db2ISeriesHISConnectionWrapper>();
771771
public Db2ISeriesHISConnectionWrapper() : base(new MsDb2Connection())
772772
{ }
773773

@@ -826,7 +826,7 @@ public override DbDataAdapter CreateDataAdapter()
826826
public class GxISeriesHIS : GxDataRecord
827827
{
828828

829-
static readonly IGXLogger log = GXLoggerFactory.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType.FullName);
829+
static readonly IGXLogger log = GXLoggerFactory.GetLogger<GxISeriesHIS>();
830830
private bool m_UseCharInDate;
831831
private string m_InitialCatalog;
832832
private string m_SqlPackage;

‎dotnet/src/dotnetframework/GxClasses/Data/GXDataHana.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace GeneXus.Data
1313
{
1414
public class GxHana : GxDataRecord
1515
{
16-
static readonly IGXLogger log = GXLoggerFactory.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType.FullName);
16+
static readonly IGXLogger log = GXLoggerFactory.GetLogger<GxHana>();
1717
static Assembly _hanaAssembly;
1818
const string HanaDbTypeEnum = "Sap.Data.Hana.HanaDbType";
1919
#if NETCORE
@@ -320,7 +320,7 @@ sealed internal class HanaConnectionWrapper : GxAbstractConnectionWrapper
320320
{
321321
const string HanaIsolationEnum = "Sap.Data.Hana.HanaIsolationLevel";
322322

323-
static readonly IGXLogger log = GXLoggerFactory.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType.FullName);
323+
static readonly IGXLogger log = GXLoggerFactory.GetLogger<HanaConnectionWrapper>();
324324
public HanaConnectionWrapper()
325325
{
326326
try

‎dotnet/src/dotnetframework/GxClasses/Data/GXDataInformix.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace GeneXus.Data
1818
{
1919
public class GxInformix : GxDataRecord
2020
{
21-
static readonly IGXLogger log = GXLoggerFactory.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType.FullName);
21+
static readonly IGXLogger log = GXLoggerFactory.GetLogger<GxInformix>();
2222
static Assembly _ifxAssembly;
2323
#if NETCORE
2424
internal static string InformixAssemblyName = "Informix.Net.Core";
@@ -584,7 +584,7 @@ sealed internal class InformixConnectionWrapper : GxAbstractConnectionWrapper
584584
{
585585
private static int changeConnState = -1;
586586
private int openDataReaders;
587-
static readonly IGXLogger log = GXLoggerFactory.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType.FullName);
587+
static readonly IGXLogger log = GXLoggerFactory.GetLogger<InformixConnectionWrapper>();
588588
public InformixConnectionWrapper()
589589
{
590590
try

‎dotnet/src/dotnetframework/GxClasses/Data/GXDataNTierService.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public ServiceCursorDef(string name, object query, GxErrorMask nmask, Object[] p
5656

5757
public class GxServiceFactory
5858
{
59-
protected static readonly IGXLogger log = GXLoggerFactory.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType.FullName);
59+
protected static readonly IGXLogger log = GXLoggerFactory.GetLogger<GxServiceFactory>();
6060

6161
public static GxService Create(string id, string providerId, string serviceClass)
6262
{
@@ -66,7 +66,7 @@ public static GxService Create(string id, string providerId, string serviceClass
6666

6767
public class GxService : GxDataRecord
6868
{
69-
protected static readonly IGXLogger log = GXLoggerFactory.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType.FullName);
69+
protected static readonly IGXLogger log = GXLoggerFactory.GetLogger<GxService>();
7070
private Type m_ServiceType;
7171
private CursorDef m_CursorDef;
7272

@@ -307,7 +307,7 @@ public interface IServiceCommand
307307

308308
sealed public class ServiceConnectionWrapper : GxAbstractConnectionWrapper
309309
{
310-
static readonly IGXLogger log = GXLoggerFactory.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType.FullName);
310+
static readonly IGXLogger log = GXLoggerFactory.GetLogger<ServiceConnectionWrapper>();
311311
public ServiceConnectionWrapper(Type runtimeClassType, String connectionString, GxConnectionCache connCache, IsolationLevel isolationLevel, String dataSource)
312312
{
313313
try

‎dotnet/src/dotnetframework/GxClasses/Data/GXDataOracle.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1436,7 +1436,7 @@ public override decimal GetDecimal(int i)
14361436
#if !NETCORE
14371437
sealed internal class MSOracleConnectionWrapper : GxAbstractConnectionWrapper
14381438
{
1439-
static readonly IGXLogger log = GXLoggerFactory.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType.FullName);
1439+
static readonly IGXLogger log = GXLoggerFactory.GetLogger<MSOracleConnectionWrapper>();
14401440
int oracle8 = -1;
14411441
public MSOracleConnectionWrapper() : base(new MSOracleProvider.OracleConnection())
14421442
{

‎dotnet/src/dotnetframework/GxClasses/Data/GXDataPostgreSQL.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ namespace GeneXus.Data
1919
{
2020
public class GxPostgreSql : GxDataRecord
2121
{
22-
static readonly IGXLogger log = GXLoggerFactory.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType.FullName);
22+
static readonly IGXLogger log = GXLoggerFactory.GetLogger<GxPostgreSql>();
2323
const string ConnectionStringEncoding = "encoding";
2424
private byte[] _buffer;
2525
static Assembly _npgsqlAssembly;
@@ -586,7 +586,7 @@ public override string ConcatOp(int pos)
586586
}
587587
sealed internal class PostgresqlConnectionWrapper : GxAbstractConnectionWrapper
588588
{
589-
static readonly IGXLogger log = GXLoggerFactory.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType.FullName);
589+
static readonly IGXLogger log = GXLoggerFactory.GetLogger<PostgresqlConnectionWrapper>();
590590
public PostgresqlConnectionWrapper()
591591
{
592592
_connection = (IDbConnection)ClassLoader.CreateInstance(GxPostgreSql.NpgsqlAssembly, "Npgsql.NpgsqlConnection");

‎dotnet/src/dotnetframework/GxClasses/Diagnostics/Log.cs‎

Lines changed: 39 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -42,74 +42,72 @@ public static void Write(int logLevel, string message, string topic)
4242
{
4343
Write(message, topic, logLevel);
4444
}
45-
4645
public static void Write(string message, string topic, int logLevel)
4746
{
48-
IGXLogger log = GetLogger(topic);
4947
LogLevel logLvl = (LogLevel)logLevel;
48+
WriteImp(message, topic, logLvl);
49+
}
5050

51-
switch (logLvl)
51+
private static void WriteImp(string message, string topic, LogLevel logLvl)
52+
{
53+
if (logLvl != LogLevel.Off)
5254
{
53-
case LogLevel.Off:
54-
break;
55-
case LogLevel.Trace:
56-
GXLogging.Trace(log, message);
57-
break;
58-
case LogLevel.Debug:
59-
GXLogging.Debug(log, message);
60-
break;
61-
case LogLevel.Info:
62-
GXLogging.Info(log, message);
63-
break;
64-
case LogLevel.Warn:
65-
GXLogging.Warn(log, message);
66-
break;
67-
case LogLevel.Error:
68-
GXLogging.Error(log, message);
69-
break;
70-
case LogLevel.Fatal:
71-
GXLogging.Critical(log, message);
72-
break;
73-
default:
74-
GXLogging.Debug(log, message);
75-
break;
76-
}
55+
IGXLogger log = GetLogger(topic);
56+
switch (logLvl)
57+
{
58+
case LogLevel.Trace:
59+
GXLogging.Trace(log, message);
60+
break;
61+
case LogLevel.Debug:
62+
GXLogging.Debug(log, message);
63+
break;
64+
case LogLevel.Info:
65+
GXLogging.Info(log, message);
66+
break;
67+
case LogLevel.Warn:
68+
GXLogging.Warn(log, message);
69+
break;
70+
case LogLevel.Error:
71+
GXLogging.Error(log, message);
72+
break;
73+
case LogLevel.Fatal:
74+
GXLogging.Critical(log, message);
75+
break;
76+
default:
77+
GXLogging.Debug(log, message);
78+
break;
79+
}
80+
}
7781
}
78-
82+
7983
public static void Write(string message, string topic = "")
8084
{
81-
IGXLogger log = GetLogger(topic);
82-
GXLogging.Debug(log, message);
85+
WriteImp(message, topic, LogLevel.Debug);
8386
}
84-
87+
8588
public static void Fatal(string message, string topic = "")
8689
{
87-
IGXLogger log = GetLogger(topic);
88-
GXLogging.Critical(log, message);
90+
WriteImp(message, topic, LogLevel.Fatal);
8991
}
9092

9193
public static void Error(string message, string topic = "")
9294
{
93-
IGXLogger log = GetLogger(topic);
94-
GXLogging.Error(log, message);
95+
WriteImp(message, topic, LogLevel.Error);
9596
}
9697

9798
public static void Warning(string message, string topic = "")
9899
{
99-
IGXLogger log = GetLogger(topic);
100-
GXLogging.Warn(log, message);
100+
WriteImp(message, topic, LogLevel.Warn);
101101
}
102102

103103
public static void Info(string message, string topic = "")
104104
{
105-
IGXLogger log = GetLogger(topic);
106-
GXLogging.Info(log, message);
105+
WriteImp(message, topic, LogLevel.Info);
107106
}
108107

109108
public static void Debug(string message, string topic = "")
110109
{
111-
IGXLogger log = GetLogger(topic);
112-
GXLogging.Debug(log, message);
110+
WriteImp(message, topic, LogLevel.Debug);
113111
}
114112
}
115113
}

‎dotnet/src/dotnetframework/GxClasses/Domain/GXLDAP.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
using System.Collections;
33
using System.DirectoryServices;
44
using System.Text;
5+
using GeneXus.Data;
6+
57
#if NETCORE
68
using Novell.Directory.Ldap;
79
#endif
@@ -10,7 +12,7 @@ namespace GeneXus.Utils
1012
{
1113
public class GXLDAPClient
1214
{
13-
static readonly IGXLogger log = GXLoggerFactory.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType.FullName);
15+
static readonly IGXLogger log = GXLoggerFactory.GetLogger<GXLDAPClient>();
1416

1517
string _server;
1618
int _port;

0 commit comments

Comments
 (0)