ApiBase: Code style and whitespace

softworkz · softworkz · commit 385dcfbf5220 · 2025-11-15T10:21:18.000+01:00
diff --git a/src/ElectronNET.API/API/ApiBase.cs b/src/ElectronNET.API/API/ApiBase.cs
@@ -58,7 +58,7 @@ protected set
         protected ApiBase()
         {
             this.objectName = this.GetType().Name.LowerFirst();
-            this.invocators = AllInvocators.GetOrAdd(objectName, _ => new ConcurrentDictionary<string, Invocator>());
+            this.invocators = AllInvocators.GetOrAdd(this.objectName, _ => new ConcurrentDictionary<string, Invocator>());
         }
 
         protected void CallMethod0([CallerMemberName] string callerName = null)
@@ -135,15 +135,15 @@ protected Task<T> InvokeAsync<T>(object arg = null, [CallerMemberName] string ca
                 }).Task<T>();
             }
         }
-        
+
         protected void AddEvent(Action value, int? id = null, [CallerMemberName] string callerName = null)
         {
             Debug.Assert(callerName != null, nameof(callerName) + " != null");
-            var eventName = EventName(callerName);
-            
-            var eventKey = EventKey(eventName, id);
+            var eventName = this.EventName(callerName);
+
+            var eventKey = this.EventKey(eventName, id);
 
-            lock (objLock)
+            lock (this.objLock)
             {
                 var container = eventContainers.GetOrAdd(eventKey, _ =>
                 {
@@ -156,14 +156,14 @@ protected void AddEvent(Action value, int? id = null, [CallerMemberName] string
                 container.Register(value);
             }
         }
-         
+
         protected void RemoveEvent(Action value, int? id = null, [CallerMemberName] string callerName = null)
         {
             Debug.Assert(callerName != null, nameof(callerName) + " != null");
-            var eventName = EventName(callerName);
-            var eventKey = EventKey(eventName, id);
+            var eventName = this.EventName(callerName);
+            var eventKey = this.EventKey(eventName, id);
 
-            lock (objLock)
+            lock (this.objLock)
             {
                 if (eventContainers.TryGetValue(eventKey, out var container) && !container.Unregister(value))
                 {
@@ -172,15 +172,15 @@ protected void RemoveEvent(Action value, int? id = null, [CallerMemberName] stri
                 }
             }
         }
-       
+
         protected void AddEvent<T>(Action<T> value, int? id = null, [CallerMemberName] string callerName = null)
         {
             Debug.Assert(callerName != null, nameof(callerName) + " != null");
-            
-            var eventName = EventName(callerName);
-            var eventKey = EventKey(eventName, id);
 
-            lock (objLock)
+            var eventName = this.EventName(callerName);
+            var eventKey = this.EventKey(eventName, id);
+
+            lock (this.objLock)
             {
                 var container = eventContainers.GetOrAdd(eventKey, _ =>
                 {
@@ -197,10 +197,10 @@ protected void AddEvent<T>(Action<T> value, int? id = null, [CallerMemberName] s
         protected void RemoveEvent<T>(Action<T> value, int? id = null, [CallerMemberName] string callerName = null)
         {
             Debug.Assert(callerName != null, nameof(callerName) + " != null");
-            var eventName = EventName(callerName);
-            var eventKey = EventKey(eventName, id);
+            var eventName = this.EventName(callerName);
+            var eventKey = this.EventKey(eventName, id);
 
-            lock (objLock)
+            lock (this.objLock)
             {
                 if (eventContainers.TryGetValue(eventKey, out var container) && !container.Unregister(value))
                 {
@@ -212,17 +212,17 @@ protected void RemoveEvent<T>(Action<T> value, int? id = null, [CallerMemberName
 
         private string EventName(string callerName)
         {
-            switch (SocketEventNameType)
+            switch (this.SocketEventNameType)
             {
                 case SocketEventNameTypes.DashedLower:
-                    return $"{objectName}-{callerName.ToDashedEventName()}";
+                    return $"{this.objectName}-{callerName.ToDashedEventName()}";
                 case SocketEventNameTypes.CamelCase:
-                    return $"{objectName}-{callerName.ToCamelCaseEventName()}";
+                    return $"{this.objectName}-{callerName.ToCamelCaseEventName()}";
                 default:
                     throw new ArgumentOutOfRangeException();
             }
         }
-        
+
         private string EventKey(string eventName, int? id)
         {
             return string.Format(CultureInfo.InvariantCulture, "{0}{1:D}", eventName, id);
@@ -257,7 +257,7 @@ public Invocator(ApiBase apiBase, string callerName, int timeoutMs, object arg =
                     default:
                         throw new ArgumentOutOfRangeException();
                 }
-                
+
                 switch (apiBase.SocketTaskMessageNameType)
                 {
                     case SocketTaskMessageNameTypes.DashesLowerFirst:
@@ -289,14 +289,14 @@ public Invocator(ApiBase apiBase, string callerName, int timeoutMs, object arg =
                         }
                     }
                 });
-                
+
                 if (arg != null)
                 {
-                    _ = apiBase.Id >= 0 ? BridgeConnector.Socket.Emit(messageName, apiBase.Id, arg) :  BridgeConnector.Socket.Emit(messageName, arg);
+                    _ = apiBase.Id >= 0 ? BridgeConnector.Socket.Emit(messageName, apiBase.Id, arg) : BridgeConnector.Socket.Emit(messageName, arg);
                 }
                 else
                 {
-                    _ = apiBase.Id >= 0 ? BridgeConnector.Socket.Emit(messageName, apiBase.Id) :  BridgeConnector.Socket.Emit(messageName);
+                    _ = apiBase.Id >= 0 ? BridgeConnector.Socket.Emit(messageName, apiBase.Id) : BridgeConnector.Socket.Emit(messageName);
                 }
 
                 System.Threading.Tasks.Task.Delay(InvocationTimeout).ContinueWith(_ =>
@@ -321,7 +321,7 @@ public override Task<T1> Task<T1>()
                 return this.tcsTask as Task<T1>;
             }
         }
-        
+
         [SuppressMessage("ReSharper", "InconsistentlySynchronizedField")]
         private class EventContainer
         {
@@ -330,41 +330,41 @@ private class EventContainer
 
             private Action<T> GetEventActionT<T>()
             {
-                return (Action<T>)eventActionT;
+                return (Action<T>)this.eventActionT;
             }
 
             private void SetEventActionT<T>(Action<T> actionT)
             {
-                eventActionT = actionT;
+                this.eventActionT = actionT;
             }
 
-            public void OnEventAction() => eventAction?.Invoke();
+            public void OnEventAction() => this.eventAction?.Invoke();
 
-            public void OnEventActionT<T>(T p) => GetEventActionT<T>()?.Invoke(p);
+            public void OnEventActionT<T>(T p) => this.GetEventActionT<T>()?.Invoke(p);
 
             public void Register(Action receiver)
             {
-                eventAction += receiver;
+                this.eventAction += receiver;
             }
 
             public void Register<T>(Action<T> receiver)
             {
-                var actionT = GetEventActionT<T>();
+                var actionT = this.GetEventActionT<T>();
                 actionT += receiver;
-                SetEventActionT(actionT);
+                this.SetEventActionT(actionT);
             }
 
             public bool Unregister(Action receiver)
             {
-                eventAction -= receiver;
+                this.eventAction -= receiver;
                 return this.eventAction != null;
             }
 
             public bool Unregister<T>(Action<T> receiver)
             {
-                var actionT = GetEventActionT<T>();
+                var actionT = this.GetEventActionT<T>();
                 actionT -= receiver;
-                SetEventActionT(actionT);
+                this.SetEventActionT(actionT);
 
                 return actionT != null;
             }

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ protected set`
`58`	`58`	`protected ApiBase()`
`59`	`59`	`{`
`60`	`60`	`this.objectName = this.GetType().Name.LowerFirst();`
`61`		`- this.invocators = AllInvocators.GetOrAdd(objectName, _ => new ConcurrentDictionary<string, Invocator>());`
	`61`	`+ this.invocators = AllInvocators.GetOrAdd(this.objectName, _ => new ConcurrentDictionary<string, Invocator>());`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`protected void CallMethod0([CallerMemberName] string callerName = null)`
`@@ -135,15 +135,15 @@ protected Task<T> InvokeAsync<T>(object arg = null, [CallerMemberName] string ca`
`135`	`135`	`}).Task<T>();`
`136`	`136`	`}`
`137`	`137`	`}`
`138`		`-`
	`138`	`+`
`139`	`139`	`protected void AddEvent(Action value, int? id = null, [CallerMemberName] string callerName = null)`
`140`	`140`	`{`
`141`	`141`	`Debug.Assert(callerName != null, nameof(callerName) + " != null");`
`142`		`- var eventName = EventName(callerName);`
`143`		`-`
`144`		`- var eventKey = EventKey(eventName, id);`
	`142`	`+ var eventName = this.EventName(callerName);`
	`143`	`+`
	`144`	`+ var eventKey = this.EventKey(eventName, id);`
`145`	`145`
`146`		`- lock (objLock)`
	`146`	`+ lock (this.objLock)`
`147`	`147`	`{`
`148`	`148`	`var container = eventContainers.GetOrAdd(eventKey, _ =>`
`149`	`149`	`{`
`@@ -156,14 +156,14 @@ protected void AddEvent(Action value, int? id = null, [CallerMemberName] string`
`156`	`156`	`container.Register(value);`
`157`	`157`	`}`
`158`	`158`	`}`
`159`		`-`
	`159`	`+`
`160`	`160`	`protected void RemoveEvent(Action value, int? id = null, [CallerMemberName] string callerName = null)`
`161`	`161`	`{`
`162`	`162`	`Debug.Assert(callerName != null, nameof(callerName) + " != null");`
`163`		`- var eventName = EventName(callerName);`
`164`		`- var eventKey = EventKey(eventName, id);`
	`163`	`+ var eventName = this.EventName(callerName);`
	`164`	`+ var eventKey = this.EventKey(eventName, id);`
`165`	`165`
`166`		`- lock (objLock)`
	`166`	`+ lock (this.objLock)`
`167`	`167`	`{`
`168`	`168`	`if (eventContainers.TryGetValue(eventKey, out var container) && !container.Unregister(value))`
`169`	`169`	`{`
`@@ -172,15 +172,15 @@ protected void RemoveEvent(Action value, int? id = null, [CallerMemberName] stri`
`172`	`172`	`}`
`173`	`173`	`}`
`174`	`174`	`}`
`175`		`-`
	`175`	`+`
`176`	`176`	`protected void AddEvent<T>(Action<T> value, int? id = null, [CallerMemberName] string callerName = null)`
`177`	`177`	`{`
`178`	`178`	`Debug.Assert(callerName != null, nameof(callerName) + " != null");`
`179`		`-`
`180`		`- var eventName = EventName(callerName);`
`181`		`- var eventKey = EventKey(eventName, id);`
`182`	`179`
`183`		`- lock (objLock)`
	`180`	`+ var eventName = this.EventName(callerName);`
	`181`	`+ var eventKey = this.EventKey(eventName, id);`
	`182`	`+`
	`183`	`+ lock (this.objLock)`
`184`	`184`	`{`
`185`	`185`	`var container = eventContainers.GetOrAdd(eventKey, _ =>`
`186`	`186`	`{`
`@@ -197,10 +197,10 @@ protected void AddEvent<T>(Action<T> value, int? id = null, [CallerMemberName] s`
`197`	`197`	`protected void RemoveEvent<T>(Action<T> value, int? id = null, [CallerMemberName] string callerName = null)`
`198`	`198`	`{`
`199`	`199`	`Debug.Assert(callerName != null, nameof(callerName) + " != null");`
`200`		`- var eventName = EventName(callerName);`
`201`		`- var eventKey = EventKey(eventName, id);`
	`200`	`+ var eventName = this.EventName(callerName);`
	`201`	`+ var eventKey = this.EventKey(eventName, id);`
`202`	`202`
`203`		`- lock (objLock)`
	`203`	`+ lock (this.objLock)`
`204`	`204`	`{`
`205`	`205`	`if (eventContainers.TryGetValue(eventKey, out var container) && !container.Unregister(value))`
`206`	`206`	`{`
`@@ -212,17 +212,17 @@ protected void RemoveEvent<T>(Action<T> value, int? id = null, [CallerMemberName`
`212`	`212`
`213`	`213`	`private string EventName(string callerName)`
`214`	`214`	`{`
`215`		`- switch (SocketEventNameType)`
	`215`	`+ switch (this.SocketEventNameType)`
`216`	`216`	`{`
`217`	`217`	`case SocketEventNameTypes.DashedLower:`
`218`		`- return $"{objectName}-{callerName.ToDashedEventName()}";`
	`218`	`+ return $"{this.objectName}-{callerName.ToDashedEventName()}";`
`219`	`219`	`case SocketEventNameTypes.CamelCase:`
`220`		`- return $"{objectName}-{callerName.ToCamelCaseEventName()}";`
	`220`	`+ return $"{this.objectName}-{callerName.ToCamelCaseEventName()}";`
`221`	`221`	`default:`
`222`	`222`	`throw new ArgumentOutOfRangeException();`
`223`	`223`	`}`
`224`	`224`	`}`
`225`		`-`
	`225`	`+`
`226`	`226`	`private string EventKey(string eventName, int? id)`
`227`	`227`	`{`
`228`	`228`	`return string.Format(CultureInfo.InvariantCulture, "{0}{1:D}", eventName, id);`
`@@ -257,7 +257,7 @@ public Invocator(ApiBase apiBase, string callerName, int timeoutMs, object arg =`
`257`	`257`	`default:`
`258`	`258`	`throw new ArgumentOutOfRangeException();`
`259`	`259`	`}`
`260`		`-`
	`260`	`+`
`261`	`261`	`switch (apiBase.SocketTaskMessageNameType)`
`262`	`262`	`{`
`263`	`263`	`case SocketTaskMessageNameTypes.DashesLowerFirst:`
`@@ -289,14 +289,14 @@ public Invocator(ApiBase apiBase, string callerName, int timeoutMs, object arg =`
`289`	`289`	`}`
`290`	`290`	`}`
`291`	`291`	`});`
`292`		`-`
	`292`	`+`
`293`	`293`	`if (arg != null)`
`294`	`294`	`{`
`295`		`- _ = apiBase.Id >= 0 ? BridgeConnector.Socket.Emit(messageName, apiBase.Id, arg) : BridgeConnector.Socket.Emit(messageName, arg);`
	`295`	`+ _ = apiBase.Id >= 0 ? BridgeConnector.Socket.Emit(messageName, apiBase.Id, arg) : BridgeConnector.Socket.Emit(messageName, arg);`
`296`	`296`	`}`
`297`	`297`	`else`
`298`	`298`	`{`
`299`		`- _ = apiBase.Id >= 0 ? BridgeConnector.Socket.Emit(messageName, apiBase.Id) : BridgeConnector.Socket.Emit(messageName);`
	`299`	`+ _ = apiBase.Id >= 0 ? BridgeConnector.Socket.Emit(messageName, apiBase.Id) : BridgeConnector.Socket.Emit(messageName);`
`300`	`300`	`}`
`301`	`301`
`302`	`302`	`System.Threading.Tasks.Task.Delay(InvocationTimeout).ContinueWith(_ =>`
`@@ -321,7 +321,7 @@ public override Task<T1> Task<T1>()`
`321`	`321`	`return this.tcsTask as Task<T1>;`
`322`	`322`	`}`
`323`	`323`	`}`
`324`		`-`
	`324`	`+`
`325`	`325`	`[SuppressMessage("ReSharper", "InconsistentlySynchronizedField")]`
`326`	`326`	`private class EventContainer`
`327`	`327`	`{`
`@@ -330,41 +330,41 @@ private class EventContainer`
`330`	`330`
`331`	`331`	`private Action<T> GetEventActionT<T>()`
`332`	`332`	`{`
`333`		`- return (Action<T>)eventActionT;`
	`333`	`+ return (Action<T>)this.eventActionT;`
`334`	`334`	`}`
`335`	`335`
`336`	`336`	`private void SetEventActionT<T>(Action<T> actionT)`
`337`	`337`	`{`
`338`		`- eventActionT = actionT;`
	`338`	`+ this.eventActionT = actionT;`
`339`	`339`	`}`
`340`	`340`
`341`		`- public void OnEventAction() => eventAction?.Invoke();`
	`341`	`+ public void OnEventAction() => this.eventAction?.Invoke();`
`342`	`342`
`343`		`- public void OnEventActionT<T>(T p) => GetEventActionT<T>()?.Invoke(p);`
	`343`	`+ public void OnEventActionT<T>(T p) => this.GetEventActionT<T>()?.Invoke(p);`
`344`	`344`
`345`	`345`	`public void Register(Action receiver)`
`346`	`346`	`{`
`347`		`- eventAction += receiver;`
	`347`	`+ this.eventAction += receiver;`
`348`	`348`	`}`
`349`	`349`
`350`	`350`	`public void Register<T>(Action<T> receiver)`
`351`	`351`	`{`
`352`		`- var actionT = GetEventActionT<T>();`
	`352`	`+ var actionT = this.GetEventActionT<T>();`
`353`	`353`	`actionT += receiver;`
`354`		`- SetEventActionT(actionT);`
	`354`	`+ this.SetEventActionT(actionT);`
`355`	`355`	`}`
`356`	`356`
`357`	`357`	`public bool Unregister(Action receiver)`
`358`	`358`	`{`
`359`		`- eventAction -= receiver;`
	`359`	`+ this.eventAction -= receiver;`
`360`	`360`	`return this.eventAction != null;`
`361`	`361`	`}`
`362`	`362`
`363`	`363`	`public bool Unregister<T>(Action<T> receiver)`
`364`	`364`	`{`
`365`		`- var actionT = GetEventActionT<T>();`
	`365`	`+ var actionT = this.GetEventActionT<T>();`
`366`	`366`	`actionT -= receiver;`
`367`		`- SetEventActionT(actionT);`
	`367`	`+ this.SetEventActionT(actionT);`
`368`	`368`
`369`	`369`	`return actionT != null;`
`370`	`370`	`}`