From 5a6747ec5088fa741bcb8b0622b8ac2cac26718f Mon Sep 17 00:00:00 2001 From: Claudia Murialdo Date: Mon, 16 May 2022 17:11:56 -0300 Subject: [PATCH] Rename method HasKey according to standard nomenclature. --- .../dotnetframework/GxClasses/Data/GXDataCommon.cs | 8 ++++---- .../dotnetframework/GxClasses/Data/GXDataDb2.cs | 6 +++--- .../dotnetframework/GxClasses/Data/GXDataDb2400.cs | 14 +++++++------- .../dotnetframework/GxClasses/Data/GXDataHana.cs | 8 ++++---- .../GxClasses/Data/GXDataInformix.cs | 8 ++++---- .../GxClasses/Data/GXDataMysqlConnector.cs | 6 +++--- .../GxClasses/Data/GXDataMysqlDriverCS.cs | 6 +++--- .../dotnetframework/GxClasses/Data/GXDataOracle.cs | 6 +++--- .../GxClasses/Data/GXDataPostgreSQL.cs | 6 +++--- .../mocking/src/MockDBAccess/GXMockDataRecord.cs | 4 ++-- 10 files changed, 36 insertions(+), 36 deletions(-) diff --git a/dotnet/src/dotnetframework/GxClasses/Data/GXDataCommon.cs b/dotnet/src/dotnetframework/GxClasses/Data/GXDataCommon.cs index 2c3d616da..cdb42ff65 100644 --- a/dotnet/src/dotnetframework/GxClasses/Data/GXDataCommon.cs +++ b/dotnet/src/dotnetframework/GxClasses/Data/GXDataCommon.cs @@ -958,7 +958,7 @@ public string ConnectionStringForLog() } return result; } - public virtual bool hasKey(string data, string key) + public virtual bool HasKey(string data, string key) { if (!string.IsNullOrEmpty(data) && data.IndexOf(key, StringComparison.OrdinalIgnoreCase) >= 0) { @@ -1961,11 +1961,11 @@ protected override string BuildConnectionString(string datasourceName, string us { StringBuilder connectionString = new StringBuilder(); string port1 = port!=null ? port.Trim() : ""; - if (!string.IsNullOrEmpty(datasourceName) && port1.Length > 0 && !hasKey(extra, "Data Source")) + if (!string.IsNullOrEmpty(datasourceName) && port1.Length > 0 && !HasKey(extra, "Data Source")) { connectionString.AppendFormat("Data Source={0},{1};",datasourceName, port1); } - else if (!string.IsNullOrEmpty(datasourceName) && !hasKey(extra, "Data Source")) + else if (!string.IsNullOrEmpty(datasourceName) && !HasKey(extra, "Data Source")) { connectionString.AppendFormat("Data Source={0};",datasourceName); } @@ -1973,7 +1973,7 @@ protected override string BuildConnectionString(string datasourceName, string us { connectionString.AppendFormat(";User ID={0};Password={1}",userId,userPassword); } - if (databaseName != null && databaseName.Trim().Length > 0 && !hasKey(extra, "Database")) + if (databaseName != null && databaseName.Trim().Length > 0 && !HasKey(extra, "Database")) { connectionString.AppendFormat(";Database={0}",databaseName); } diff --git a/dotnet/src/dotnetframework/GxClasses/Data/GXDataDb2.cs b/dotnet/src/dotnetframework/GxClasses/Data/GXDataDb2.cs index 3d4eb0999..eebaa6ed3 100644 --- a/dotnet/src/dotnetframework/GxClasses/Data/GXDataDb2.cs +++ b/dotnet/src/dotnetframework/GxClasses/Data/GXDataDb2.cs @@ -177,11 +177,11 @@ protected override string BuildConnectionString(string datasourceName, string us { StringBuilder connectionString = new StringBuilder(); - if (!string.IsNullOrEmpty(datasourceName) && port != null && port.Trim().Length > 0 && !hasKey(extra, "Server")) + if (!string.IsNullOrEmpty(datasourceName) && port != null && port.Trim().Length > 0 && !HasKey(extra, "Server")) { connectionString.AppendFormat("Server={0}:{1};",datasourceName, port); } - else if (datasourceName != null && !hasKey(extra, "Server")) + else if (datasourceName != null && !HasKey(extra, "Server")) { connectionString.AppendFormat("Server={0};",datasourceName); @@ -190,7 +190,7 @@ protected override string BuildConnectionString(string datasourceName, string us { connectionString.AppendFormat(";UID={0};Password={1}", userId, userPassword); } - if (databaseName != null && databaseName.Trim().Length > 0 && !hasKey(extra, "Database")) + if (databaseName != null && databaseName.Trim().Length > 0 && !HasKey(extra, "Database")) { connectionString.AppendFormat(";Database={0}",databaseName); } diff --git a/dotnet/src/dotnetframework/GxClasses/Data/GXDataDb2400.cs b/dotnet/src/dotnetframework/GxClasses/Data/GXDataDb2400.cs index 14796df6a..a569fd0d2 100644 --- a/dotnet/src/dotnetframework/GxClasses/Data/GXDataDb2400.cs +++ b/dotnet/src/dotnetframework/GxClasses/Data/GXDataDb2400.cs @@ -234,7 +234,7 @@ protected override string BuildConnectionString(string datasourceName, string us { StringBuilder connectionString = new StringBuilder(); - if (!string.IsNullOrEmpty(datasourceName) && !hasKey(extra, "Data Source")) + if (!string.IsNullOrEmpty(datasourceName) && !HasKey(extra, "Data Source")) { connectionString.AppendFormat("Data Source={0};",datasourceName); } @@ -242,12 +242,12 @@ protected override string BuildConnectionString(string datasourceName, string us { connectionString.AppendFormat("User ID={0};Password={1};",userId,userPassword); } - if (databaseName != null && databaseName.Trim().Length > 0 && !hasKey(extra, "Default Collection")) + if (databaseName != null && databaseName.Trim().Length > 0 && !HasKey(extra, "Default Collection")) { connectionString.AppendFormat("Default Collection={0};", databaseName); } - if (!String.IsNullOrEmpty(m_InitialCatalog) && !hasKey(extra, "Database")) + if (!String.IsNullOrEmpty(m_InitialCatalog) && !HasKey(extra, "Database")) { connectionString.AppendFormat("Database={0}", m_InitialCatalog); } @@ -867,7 +867,7 @@ protected override string BuildConnectionString(string datasourceName, string us StringBuilder connectionString = new StringBuilder(); connectionString.Append("Provider=DB2OLEDB;Network Port=446;Network Transport Library=TCP;"); - if (!string.IsNullOrEmpty(datasourceName) && !hasKey(extra, "Network Address")) + if (!string.IsNullOrEmpty(datasourceName) && !HasKey(extra, "Network Address")) { connectionString.AppendFormat("Network Address={0};", datasourceName); } @@ -875,15 +875,15 @@ protected override string BuildConnectionString(string datasourceName, string us { connectionString.AppendFormat("User ID={0};Password={1};", userId, userPassword); } - if (databaseName != null && databaseName.Trim().Length > 0 && !hasKey(extra, "Default Qualifier")) + if (databaseName != null && databaseName.Trim().Length > 0 && !HasKey(extra, "Default Qualifier")) { connectionString.AppendFormat("Default Qualifier={0};", databaseName); } - if (!String.IsNullOrEmpty(m_InitialCatalog) && !hasKey(extra, "Initial Catalog")) + if (!String.IsNullOrEmpty(m_InitialCatalog) && !HasKey(extra, "Initial Catalog")) { connectionString.AppendFormat("Initial Catalog={0};", m_InitialCatalog); } - if (!string.IsNullOrEmpty(m_SqlPackage) && !hasKey(extra, "Package Collection")) + if (!string.IsNullOrEmpty(m_SqlPackage) && !HasKey(extra, "Package Collection")) { connectionString.AppendFormat("Package Collection={0}", m_SqlPackage); } diff --git a/dotnet/src/dotnetframework/GxClasses/Data/GXDataHana.cs b/dotnet/src/dotnetframework/GxClasses/Data/GXDataHana.cs index 9842e4b16..892dc4e41 100644 --- a/dotnet/src/dotnetframework/GxClasses/Data/GXDataHana.cs +++ b/dotnet/src/dotnetframework/GxClasses/Data/GXDataHana.cs @@ -71,11 +71,11 @@ protected override string BuildConnectionString(string datasourceName, string us { StringBuilder connectionString = new StringBuilder(); - if (!string.IsNullOrEmpty(datasourceName) && port != null && port.Trim().Length > 0 && !hasKey(extra, "Server")) + if (!string.IsNullOrEmpty(datasourceName) && port != null && port.Trim().Length > 0 && !HasKey(extra, "Server")) { connectionString.AppendFormat("Server={0}:{1};", datasourceName, port); } - else if (datasourceName != null && !hasKey(extra, "Server")) + else if (datasourceName != null && !HasKey(extra, "Server")) { connectionString.AppendFormat("Server={0}:30015;", datasourceName); } @@ -83,11 +83,11 @@ protected override string BuildConnectionString(string datasourceName, string us { connectionString.AppendFormat(";UserID={0};Password={1}", userId, userPassword); } - if (databaseName != null && databaseName.Trim().Length > 0 && !hasKey(extra, "Database")) + if (databaseName != null && databaseName.Trim().Length > 0 && !HasKey(extra, "Database")) { connectionString.AppendFormat(";Database={0}", databaseName); } - if (schema != null && schema.Trim().Length > 0 && !hasKey(extra, "Current Schema")) + if (schema != null && schema.Trim().Length > 0 && !HasKey(extra, "Current Schema")) { connectionString.AppendFormat(";Current Schema={0}", schema); } diff --git a/dotnet/src/dotnetframework/GxClasses/Data/GXDataInformix.cs b/dotnet/src/dotnetframework/GxClasses/Data/GXDataInformix.cs index ad8129cc3..7700a6d60 100644 --- a/dotnet/src/dotnetframework/GxClasses/Data/GXDataInformix.cs +++ b/dotnet/src/dotnetframework/GxClasses/Data/GXDataInformix.cs @@ -153,17 +153,17 @@ protected override string BuildConnectionString(string datasourceName, string us { StringBuilder connectionString = new StringBuilder(); - if (!string.IsNullOrEmpty(datasourceName) && !hasKey(extra, "Host")) + if (!string.IsNullOrEmpty(datasourceName) && !HasKey(extra, "Host")) { connectionString.AppendFormat("Host={0};", datasourceName); } - if (m_serverInstance != null && m_serverInstance.Trim().Length > 0 && !hasKey(extra, "Server")) + if (m_serverInstance != null && m_serverInstance.Trim().Length > 0 && !HasKey(extra, "Server")) { connectionString.AppendFormat("Server={0};", m_serverInstance); } - if (port != null && port.Trim().Length > 0 && !hasKey(extra, "Service")) + if (port != null && port.Trim().Length > 0 && !HasKey(extra, "Service")) { connectionString.AppendFormat("Service={0};", port); @@ -172,7 +172,7 @@ protected override string BuildConnectionString(string datasourceName, string us { connectionString.AppendFormat(";User ID={0};Password={1}", userId, userPassword); } - if (databaseName != null && databaseName.Trim().Length > 0 && !hasKey(extra, "Database")) + if (databaseName != null && databaseName.Trim().Length > 0 && !HasKey(extra, "Database")) { connectionString.AppendFormat(";Database={0}", databaseName); } diff --git a/dotnet/src/dotnetframework/GxClasses/Data/GXDataMysqlConnector.cs b/dotnet/src/dotnetframework/GxClasses/Data/GXDataMysqlConnector.cs index f3f07ee2e..d53db56cc 100644 --- a/dotnet/src/dotnetframework/GxClasses/Data/GXDataMysqlConnector.cs +++ b/dotnet/src/dotnetframework/GxClasses/Data/GXDataMysqlConnector.cs @@ -110,11 +110,11 @@ protected override string BuildConnectionString(string datasourceName, string us { StringBuilder connectionString = new StringBuilder(); - if (!string.IsNullOrEmpty(datasourceName) && !hasKey(extra, "Server")) + if (!string.IsNullOrEmpty(datasourceName) && !HasKey(extra, "Server")) { connectionString.AppendFormat("Server={0};", datasourceName); } - if (port != null && port.Trim().Length > 0 && !hasKey(extra, "Port")) + if (port != null && port.Trim().Length > 0 && !HasKey(extra, "Port")) { connectionString.AppendFormat("Port={0};", port); } @@ -122,7 +122,7 @@ protected override string BuildConnectionString(string datasourceName, string us { connectionString.AppendFormat(";User ID={0};Password={1}", userId, userPassword); } - if (databaseName != null && databaseName.Trim().Length > 0 && !hasKey(extra, "Database")) + if (databaseName != null && databaseName.Trim().Length > 0 && !HasKey(extra, "Database")) { connectionString.AppendFormat(";Database={0}", databaseName); } diff --git a/dotnet/src/dotnetframework/GxClasses/Data/GXDataMysqlDriverCS.cs b/dotnet/src/dotnetframework/GxClasses/Data/GXDataMysqlDriverCS.cs index 6f96cda96..42e3471b4 100644 --- a/dotnet/src/dotnetframework/GxClasses/Data/GXDataMysqlDriverCS.cs +++ b/dotnet/src/dotnetframework/GxClasses/Data/GXDataMysqlDriverCS.cs @@ -70,11 +70,11 @@ protected override string BuildConnectionString(string datasourceName, string us string userPassword, string databaseName, string port, string schema, string extra) { StringBuilder connectionString = new StringBuilder(); - if (!string.IsNullOrEmpty(datasourceName) && !hasKey(extra, "Location")) + if (!string.IsNullOrEmpty(datasourceName) && !HasKey(extra, "Location")) { connectionString.AppendFormat("Location={0};", datasourceName); } - if (port != null && port.Trim().Length > 0 && !hasKey(extra, "Port")) + if (port != null && port.Trim().Length > 0 && !HasKey(extra, "Port")) { connectionString.AppendFormat("Port={0};", port); } @@ -82,7 +82,7 @@ protected override string BuildConnectionString(string datasourceName, string us { connectionString.AppendFormat(";User ID={0};Password={1}", userId, userPassword); } - if (databaseName != null && databaseName.Trim().Length > 0 && !hasKey(extra, "Data Source")) + if (databaseName != null && databaseName.Trim().Length > 0 && !HasKey(extra, "Data Source")) { connectionString.AppendFormat(";Data Source={0}", databaseName); } diff --git a/dotnet/src/dotnetframework/GxClasses/Data/GXDataOracle.cs b/dotnet/src/dotnetframework/GxClasses/Data/GXDataOracle.cs index ffdb23948..2467150b6 100644 --- a/dotnet/src/dotnetframework/GxClasses/Data/GXDataOracle.cs +++ b/dotnet/src/dotnetframework/GxClasses/Data/GXDataOracle.cs @@ -297,7 +297,7 @@ protected override string BuildConnectionString(string datasourceName, string us { StringBuilder connectionString = new StringBuilder(); - if (!string.IsNullOrEmpty(datasourceName) && !hasKey(extra, "Data Source")) + if (!string.IsNullOrEmpty(datasourceName) && !HasKey(extra, "Data Source")) { connectionString.AppendFormat("Data Source={0};", datasourceName); } @@ -618,7 +618,7 @@ protected override string BuildConnectionString(string datasourceName, string us { StringBuilder connectionString = new StringBuilder(); - if (!string.IsNullOrEmpty(datasourceName) && !hasKey(extra, "Data Source")) + if (!string.IsNullOrEmpty(datasourceName) && !HasKey(extra, "Data Source")) { connectionString.AppendFormat("Data Source={0};", datasourceName); } @@ -888,7 +888,7 @@ protected override string BuildConnectionString(string datasourceName, string us { StringBuilder connectionString = new StringBuilder(); - if (!string.IsNullOrEmpty(datasourceName) && !hasKey(extra, "Data Source")) + if (!string.IsNullOrEmpty(datasourceName) && !HasKey(extra, "Data Source")) { connectionString.AppendFormat("Data Source={0};", datasourceName); } diff --git a/dotnet/src/dotnetframework/GxClasses/Data/GXDataPostgreSQL.cs b/dotnet/src/dotnetframework/GxClasses/Data/GXDataPostgreSQL.cs index 577b38256..f13f25d44 100644 --- a/dotnet/src/dotnetframework/GxClasses/Data/GXDataPostgreSQL.cs +++ b/dotnet/src/dotnetframework/GxClasses/Data/GXDataPostgreSQL.cs @@ -106,11 +106,11 @@ protected override string BuildConnectionString(string datasourceName, string us { StringBuilder connectionString = new StringBuilder(); - if (!string.IsNullOrEmpty(datasourceName) && !hasKey(extra, "Server")) + if (!string.IsNullOrEmpty(datasourceName) && !HasKey(extra, "Server")) { connectionString.AppendFormat("Server={0};", datasourceName); } - if (port != null && port.Trim().Length > 0 && !hasKey(extra, "Port")) + if (port != null && port.Trim().Length > 0 && !HasKey(extra, "Port")) { connectionString.AppendFormat("Port={0};", port); } @@ -118,7 +118,7 @@ protected override string BuildConnectionString(string datasourceName, string us { connectionString.AppendFormat(";User ID={0};Password={1}", userId, userPassword); } - if (databaseName != null && databaseName.Trim().Length > 0 && !hasKey(extra, "Database")) + if (databaseName != null && databaseName.Trim().Length > 0 && !HasKey(extra, "Database")) { connectionString.AppendFormat(";Database={0}", databaseName); } diff --git a/dotnet/src/extensions/mocking/src/MockDBAccess/GXMockDataRecord.cs b/dotnet/src/extensions/mocking/src/MockDBAccess/GXMockDataRecord.cs index ff809e59f..b7a9c3dea 100644 --- a/dotnet/src/extensions/mocking/src/MockDBAccess/GXMockDataRecord.cs +++ b/dotnet/src/extensions/mocking/src/MockDBAccess/GXMockDataRecord.cs @@ -395,9 +395,9 @@ public override void PrepareCommand(IDbCommand cmd) realDataRecord.PrepareCommand(cmd); } - public override bool hasKey(string data, string key) + public override bool HasKey(string data, string key) { - return realDataRecord.hasKey(data, key); + return realDataRecord.HasKey(data, key); } public override string ParseAdditionalData(string data, string extractWord)