It's optional to send connectionstring or fullynamespace.

sjuarezgx · sjuarezgx · commit 138732cb9157 · 2023-08-15T22:53:16.000-03:00
diff --git a/dotnet/src/dotnetcore/Providers/Messaging/GXMessageBroker/MessageBrokerProvider.cs b/dotnet/src/dotnetcore/Providers/Messaging/GXMessageBroker/MessageBrokerProvider.cs
@@ -11,7 +11,7 @@ namespace GeneXus.Messaging.Common
 	[GXApi]
 	public class MessageBrokerProvider : MessageQueue
 	{
-		static readonly ILog logger = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+		static readonly ILog logger = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
 		private static GXService providerService;
 		public MessageBrokerProvider()
 		{
@@ -64,7 +64,7 @@ public MessageQueue Connect(string providerTypeName, GXProperties properties, ou
 			success = true;
 			return (messageQueue);
 		}
-		private static void Preprocess(String name, GXProperties properties)
+		private static void Preprocess(string name, GXProperties properties)
 		{
 			string className;
 
@@ -75,6 +75,7 @@ private static void Preprocess(String name, GXProperties properties)
 					SetEncryptedProperty(properties, PropertyConstants.MESSAGEBROKER_AZURESB_QUEUENAME);
 					SetEncryptedProperty(properties, PropertyConstants.MESSAGEBROKER_AZURESB_SUBSCRIPTION_NAME);
 					SetEncryptedProperty(properties, PropertyConstants.MESSAGEBROKER_AZURESB_CONNECTIONSTRING);
+					SetEncryptedProperty(properties, PropertyConstants.MESSAGEBROKER_AZURESB_FULLYQUALIFIEDNAMESPACE);
 					if (string.IsNullOrEmpty(providerService.ClassName) || !providerService.ClassName.Contains(className))
 					{
 						providerService.ClassName = PropertyConstants.AZURE_SB_PROVIDER_CLASSNAME;
@@ -84,11 +85,11 @@ private static void Preprocess(String name, GXProperties properties)
 					throw new SystemException(string.Format("Provider {0} is not supported.", name));
 			}
 		}
-		private static void SetEncryptedProperty(GXProperties properties, String prop)
+		private static void SetEncryptedProperty(GXProperties properties, string prop)
 		{
-			String value = properties.Get(prop);
+			string value = properties.Get(prop);
 			if (string.IsNullOrEmpty(value))
-				value = String.Empty;
+				value = string.Empty;
 			value = CryptoImpl.Encrypt(value);
 			properties.Set(prop, value);
 		}
diff --git a/dotnet/src/dotnetcore/Providers/Messaging/GXMessageBroker/ServiceSettings.cs b/dotnet/src/dotnetcore/Providers/Messaging/GXMessageBroker/ServiceSettings.cs
@@ -1,18 +1,13 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using GeneXus.Encryption;
-using GeneXus.Messaging.Common;
 using GeneXus.Services;
 using log4net;
 
 namespace GeneXus.Messaging.Common
 {
 	public class ServiceSettings 
 	{
-		static readonly ILog logger = log4net.LogManager.GetLogger(typeof(ServiceSettings));
+		static readonly ILog logger = LogManager.GetLogger(typeof(ServiceSettings));
 
 		internal GXService service;
 		public string serviceNameResolver { get; }
@@ -22,61 +17,61 @@ public ServiceSettings(string serviceNameResolver, string name, GXService gXServ
 		{
 			this.serviceNameResolver = serviceNameResolver;
 			this.name = name;
-			this.service = gXService;
+			service = gXService;
 		}
 
 		public string GetEncryptedOptPropertyValue(string propertyName, string alternativePropertyName = null)
 		{
-			String value = GetEncryptedPropertyValue(propertyName, alternativePropertyName, null);		
+			string value = GetEncryptedPropertyValue(propertyName, alternativePropertyName, null);		
 			return value;
 		}
 		public string GetEncryptedPropertyValue(string propertyName, string alternativePropertyName = null)
 		{
-			String value = GetEncryptedPropertyValue(propertyName, alternativePropertyName, null);
+			string value = GetEncryptedPropertyValue(propertyName, alternativePropertyName, null);
 			if (value == null)
 			{
-				String errorMessage = String.Format($"Service configuration error - Property name {ResolvePropertyName(propertyName)} must be defined");
-				logger.Fatal(errorMessage);
+				string errorMessage = string.Format($"Service configuration error - Property name {ResolvePropertyName(propertyName)} must be defined");
+				GXLogging.Error(logger, errorMessage);
 				throw new Exception(errorMessage);
 			}
 			return value;
 		}
 		public string GetEncryptedPropertyValue(string propertyName, string alternativePropertyName, string defaultValue)
 		{
-			String value = GetPropertyValue(propertyName, alternativePropertyName, defaultValue);
-			if (!String.IsNullOrEmpty(value))
+			string value = GetPropertyValue(propertyName, alternativePropertyName, defaultValue);
+			if (!string.IsNullOrEmpty(value))
 			{
 				try
 				{
-					string ret = String.Empty;
+					string ret = string.Empty;
 					if (CryptoImpl.Decrypt(ref ret, value))
 					{
 						value = ret;
 					}
 				}
 				catch (Exception)
 				{
-					logger.Warn($"Could not decrypt property name: {ResolvePropertyName(propertyName)}");
+					GXLogging.Warn(logger, $"Could not decrypt property name: {ResolvePropertyName(propertyName)}");
 				}
 			}
 			return value;
 		}
 
 		internal string GetPropertyValue(string propertyName, string alternativePropertyName = null)
 		{
-			String value = GetPropertyValue(propertyName, alternativePropertyName, null);
+			string value = GetPropertyValue(propertyName, alternativePropertyName, null);
 			if (value == null)
 			{
-				String errorMessage = String.Format($"Service configuration error - Property name {ResolvePropertyName(propertyName)} must be defined");
-				logger.Fatal(errorMessage);
+				string errorMessage = string.Format($"Service configuration error - Property name {ResolvePropertyName(propertyName)} must be defined");
+				GXLogging.Error(logger,errorMessage);
 				throw new Exception(errorMessage);
 			}
 			return value;
 		}
 
 		internal string GetPropertyValue(string propertyName, string alternativePropertyName, string defaultValue)
 		{
-			String value = null;
+			string value = null;
 			value = string.IsNullOrEmpty(value) ? GetPropertyValueImpl(ResolvePropertyName(propertyName)) : value;
 			value = string.IsNullOrEmpty(value) ? GetPropertyValueImpl(propertyName) : value;
 			value = string.IsNullOrEmpty(value) ? GetPropertyValueImpl(alternativePropertyName) : value;
@@ -86,7 +81,7 @@ internal string GetPropertyValue(string propertyName, string alternativeProperty
 
 		internal string GetPropertyValueImpl(string propertyName)
 		{
-			String value = null;
+			string value = null;
 			if (!string.IsNullOrEmpty(propertyName))
 			{
 				value = Environment.GetEnvironmentVariable(propertyName);

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ namespace GeneXus.Messaging.Common`
`11`	`11`	`[GXApi]`
`12`	`12`	`public class MessageBrokerProvider : MessageQueue`
`13`	`13`	`{`
`14`		`- static readonly ILog logger = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);`
	`14`	`+ static readonly ILog logger = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);`
`15`	`15`	`private static GXService providerService;`
`16`	`16`	`public MessageBrokerProvider()`
`17`	`17`	`{`
`@@ -64,7 +64,7 @@ public MessageQueue Connect(string providerTypeName, GXProperties properties, ou`
`64`	`64`	`success = true;`
`65`	`65`	`return (messageQueue);`
`66`	`66`	`}`
`67`		`- private static void Preprocess(String name, GXProperties properties)`
	`67`	`+ private static void Preprocess(string name, GXProperties properties)`
`68`	`68`	`{`
`69`	`69`	`string className;`
`70`	`70`
`@@ -75,6 +75,7 @@ private static void Preprocess(String name, GXProperties properties)`
`75`	`75`	`SetEncryptedProperty(properties, PropertyConstants.MESSAGEBROKER_AZURESB_QUEUENAME);`
`76`	`76`	`SetEncryptedProperty(properties, PropertyConstants.MESSAGEBROKER_AZURESB_SUBSCRIPTION_NAME);`
`77`	`77`	`SetEncryptedProperty(properties, PropertyConstants.MESSAGEBROKER_AZURESB_CONNECTIONSTRING);`
	`78`	`+ SetEncryptedProperty(properties, PropertyConstants.MESSAGEBROKER_AZURESB_FULLYQUALIFIEDNAMESPACE);`
`78`	`79`	`if (string.IsNullOrEmpty(providerService.ClassName) \|\| !providerService.ClassName.Contains(className))`
`79`	`80`	`{`
`80`	`81`	`providerService.ClassName = PropertyConstants.AZURE_SB_PROVIDER_CLASSNAME;`
`@@ -84,11 +85,11 @@ private static void Preprocess(String name, GXProperties properties)`
`84`	`85`	`throw new SystemException(string.Format("Provider {0} is not supported.", name));`
`85`	`86`	`}`
`86`	`87`	`}`
`87`		`- private static void SetEncryptedProperty(GXProperties properties, String prop)`
	`88`	`+ private static void SetEncryptedProperty(GXProperties properties, string prop)`
`88`	`89`	`{`
`89`		`- String value = properties.Get(prop);`
	`90`	`+ string value = properties.Get(prop);`
`90`	`91`	`if (string.IsNullOrEmpty(value))`
`91`		`- value = String.Empty;`
	`92`	`+ value = string.Empty;`
`92`	`93`	`value = CryptoImpl.Encrypt(value);`
`93`	`94`	`properties.Set(prop, value);`
`94`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,13 @@`
`1`	`1`	`using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Linq;`
`4`		`-using System.Text;`
`5`		`-using System.Threading.Tasks;`
`6`	`2`	`using GeneXus.Encryption;`
`7`		`-using GeneXus.Messaging.Common;`
`8`	`3`	`using GeneXus.Services;`
`9`	`4`	`using log4net;`
`10`	`5`
`11`	`6`	`namespace GeneXus.Messaging.Common`
`12`	`7`	`{`
`13`	`8`	`public class ServiceSettings`
`14`	`9`	`{`
`15`		`- static readonly ILog logger = log4net.LogManager.GetLogger(typeof(ServiceSettings));`
	`10`	`+ static readonly ILog logger = LogManager.GetLogger(typeof(ServiceSettings));`
`16`	`11`
`17`	`12`	`internal GXService service;`
`18`	`13`	`public string serviceNameResolver { get; }`
`@@ -22,61 +17,61 @@ public ServiceSettings(string serviceNameResolver, string name, GXService gXServ`
`22`	`17`	`{`
`23`	`18`	`this.serviceNameResolver = serviceNameResolver;`
`24`	`19`	`this.name = name;`
`25`		`- this.service = gXService;`
	`20`	`+ service = gXService;`
`26`	`21`	`}`
`27`	`22`
`28`	`23`	`public string GetEncryptedOptPropertyValue(string propertyName, string alternativePropertyName = null)`
`29`	`24`	`{`
`30`		`- String value = GetEncryptedPropertyValue(propertyName, alternativePropertyName, null);`
	`25`	`+ string value = GetEncryptedPropertyValue(propertyName, alternativePropertyName, null);`
`31`	`26`	`return value;`
`32`	`27`	`}`
`33`	`28`	`public string GetEncryptedPropertyValue(string propertyName, string alternativePropertyName = null)`
`34`	`29`	`{`
`35`		`- String value = GetEncryptedPropertyValue(propertyName, alternativePropertyName, null);`
	`30`	`+ string value = GetEncryptedPropertyValue(propertyName, alternativePropertyName, null);`
`36`	`31`	`if (value == null)`
`37`	`32`	`{`
`38`		`- String errorMessage = String.Format($"Service configuration error - Property name {ResolvePropertyName(propertyName)} must be defined");`
`39`		`- logger.Fatal(errorMessage);`
	`33`	`+ string errorMessage = string.Format($"Service configuration error - Property name {ResolvePropertyName(propertyName)} must be defined");`
	`34`	`+ GXLogging.Error(logger, errorMessage);`
`40`	`35`	`throw new Exception(errorMessage);`
`41`	`36`	`}`
`42`	`37`	`return value;`
`43`	`38`	`}`
`44`	`39`	`public string GetEncryptedPropertyValue(string propertyName, string alternativePropertyName, string defaultValue)`
`45`	`40`	`{`
`46`		`- String value = GetPropertyValue(propertyName, alternativePropertyName, defaultValue);`
`47`		`- if (!String.IsNullOrEmpty(value))`
	`41`	`+ string value = GetPropertyValue(propertyName, alternativePropertyName, defaultValue);`
	`42`	`+ if (!string.IsNullOrEmpty(value))`
`48`	`43`	`{`
`49`	`44`	`try`
`50`	`45`	`{`
`51`		`- string ret = String.Empty;`
	`46`	`+ string ret = string.Empty;`
`52`	`47`	`if (CryptoImpl.Decrypt(ref ret, value))`
`53`	`48`	`{`
`54`	`49`	`value = ret;`
`55`	`50`	`}`
`56`	`51`	`}`
`57`	`52`	`catch (Exception)`
`58`	`53`	`{`
`59`		`- logger.Warn($"Could not decrypt property name: {ResolvePropertyName(propertyName)}");`
	`54`	`+ GXLogging.Warn(logger, $"Could not decrypt property name: {ResolvePropertyName(propertyName)}");`
`60`	`55`	`}`
`61`	`56`	`}`
`62`	`57`	`return value;`
`63`	`58`	`}`
`64`	`59`
`65`	`60`	`internal string GetPropertyValue(string propertyName, string alternativePropertyName = null)`
`66`	`61`	`{`
`67`		`- String value = GetPropertyValue(propertyName, alternativePropertyName, null);`
	`62`	`+ string value = GetPropertyValue(propertyName, alternativePropertyName, null);`
`68`	`63`	`if (value == null)`
`69`	`64`	`{`
`70`		`- String errorMessage = String.Format($"Service configuration error - Property name {ResolvePropertyName(propertyName)} must be defined");`
`71`		`- logger.Fatal(errorMessage);`
	`65`	`+ string errorMessage = string.Format($"Service configuration error - Property name {ResolvePropertyName(propertyName)} must be defined");`
	`66`	`+ GXLogging.Error(logger,errorMessage);`
`72`	`67`	`throw new Exception(errorMessage);`
`73`	`68`	`}`
`74`	`69`	`return value;`
`75`	`70`	`}`
`76`	`71`
`77`	`72`	`internal string GetPropertyValue(string propertyName, string alternativePropertyName, string defaultValue)`
`78`	`73`	`{`
`79`		`- String value = null;`
	`74`	`+ string value = null;`
`80`	`75`	`value = string.IsNullOrEmpty(value) ? GetPropertyValueImpl(ResolvePropertyName(propertyName)) : value;`
`81`	`76`	`value = string.IsNullOrEmpty(value) ? GetPropertyValueImpl(propertyName) : value;`
`82`	`77`	`value = string.IsNullOrEmpty(value) ? GetPropertyValueImpl(alternativePropertyName) : value;`
`@@ -86,7 +81,7 @@ internal string GetPropertyValue(string propertyName, string alternativeProperty`
`86`	`81`
`87`	`82`	`internal string GetPropertyValueImpl(string propertyName)`
`88`	`83`	`{`
`89`		`- String value = null;`
	`84`	`+ string value = null;`
`90`	`85`	`if (!string.IsNullOrEmpty(propertyName))`
`91`	`86`	`{`
`92`	`87`	`value = Environment.GetEnvironmentVariable(propertyName);`