Clean up some warnings and PR findings

seveneleven · seveneleven · commit 7eae03a52a3b · 2025-12-02T15:27:35.000+01:00
diff --git a/src/Moryx.Drivers.OpcUa/ApplicationConfigurationFactory.cs b/src/Moryx.Drivers.OpcUa/ApplicationConfigurationFactory.cs
@@ -1,6 +1,8 @@
 // Copyright (c) 2025, Phoenix Contact GmbH & Co. KG
+// Licensed under the Apache License, Version 2.0
 
 using Microsoft.Extensions.Logging;
+using Moryx.Drivers.OpcUa.Exceptions;
 using Opc.Ua;
 using Opc.Ua.Configuration;
 
@@ -40,7 +42,7 @@ public virtual async Task<ApplicationConfiguration> Create(ILogger logger, strin
         var haveAppCertificate = await application.CheckApplicationInstanceCertificate(false, 0);
         if (!haveAppCertificate)
         {
-            throw new Exception("Application instance certificate invalid!");
+            throw new InvalidCertificateException("Application instance certificate invalid!");
         }
         else
         {
diff --git a/src/Moryx.Drivers.OpcUa/Exceptions/InvalidCertificateException.cs b/src/Moryx.Drivers.OpcUa/Exceptions/InvalidCertificateException.cs
@@ -0,0 +1,20 @@
+// Copyright (c) 2025, Phoenix Contact GmbH & Co. KG
+// Licensed under the Apache License, Version 2.0
+
+namespace Moryx.Drivers.OpcUa.Exceptions;
+
+[Serializable]
+internal class InvalidCertificateException : Exception
+{
+    public InvalidCertificateException()
+    {
+    }
+
+    public InvalidCertificateException(string message) : base(message)
+    {
+    }
+
+    public InvalidCertificateException(string message, Exception innerException) : base(message, innerException)
+    {
+    }
+}
diff --git a/src/Moryx.Drivers.OpcUa/Nodes/OpcUaNode.cs b/src/Moryx.Drivers.OpcUa/Nodes/OpcUaNode.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0
 
 using System.Globalization;
-using System.Text.RegularExpressions;
 using Microsoft.Extensions.Logging;
 using Moryx.AbstractionLayer.Drivers;
 using Moryx.AbstractionLayer.Drivers.Message;
@@ -82,6 +81,9 @@ public event EventHandler<object> Received
         }
     }
 
+    /// <summary>
+    /// Converts a NodeId string into an expanded NodeId string that matches the OPC UA specification;
+    /// </summary>
     public static string CreateExpandedNodeId(string nodeId)
     {
         var result = nodeId.Trim();
@@ -90,15 +92,18 @@ public static string CreateExpandedNodeId(string nodeId)
         return result;
     }
 
-    private static string RemoveNamespaceIndexZero(string @string)
+    private static string RemoveNamespaceIndexZero(string nodeId)
     {
-        if (@string.StartsWith("ns=0;"))
+        if (nodeId.StartsWith("ns=0;"))
         {
-            return @string.Substring(5);
+            return nodeId[5..];
         }
-        return @string;
+        return nodeId;
     }
 
+    /// <summary>
+    /// Converts a NodeId into an expanded NodeId string that matches the OPC UA specification;
+    /// </summary>
     public static string CreateExpandedNodeId(NodeId nodeId)
     {
         return CreateExpandedNodeId(nodeId.ToString());
@@ -114,17 +119,21 @@ private OpcUaNode(IOpcUaDriver driver, IModuleLogger logger)
 
     }
 
+    /// <inheritdoc />
     public OpcUaNode(IOpcUaDriver driver, IModuleLogger logger, string namespaceUri, string nodeIdValue)
         : this(driver, logger)
     {
         NodeId = new ExpandedNodeId(nodeIdValue, namespaceUri);
     }
 
+    /// <inheritdoc />
     public OpcUaNode(IOpcUaDriver driver, IModuleLogger logger, ExpandedNodeId nodeId, NamespaceTable namespaceTable)
         : this(driver, logger)
     {
         NodeId = new ExpandedNodeId(nodeId.Identifier, nodeId.NamespaceIndex, namespaceTable.GetString(nodeId.NamespaceIndex), nodeId.ServerIndex);
     }
+
+    /// <inheritdoc />
     public OpcUaNode(IOpcUaDriver driver, IModuleLogger logger, string identifier)
     {
         Driver = driver;
@@ -150,7 +159,7 @@ public void Send(object payload)
             _logger?.Log(LogLevel.Error, "It is tried to read the value of node {NodeId}, but the node is no variable node", NodeId);
             return;
         }
-        _driver.WriteNode(this.Identifier, payload);
+        _driver.WriteNode(Identifier, payload);
     }
 
     /// <summary>
diff --git a/src/Moryx.Drivers.OpcUa/Nodes/OpcUaNodeHelpers.cs b/src/Moryx.Drivers.OpcUa/Nodes/OpcUaNodeHelpers.cs
@@ -8,5 +8,5 @@ namespace Moryx.Drivers.OpcUa;
 internal static partial class OpcUaNodeHelpers
 {
     [GeneratedRegex(";ns=\\d+")]
-    public static partial Regex StringWithUriAndNamespaceIndex();
+    public static partial Regex NodeIdWithNamespaceIndexRegex();
 }
diff --git a/src/Moryx.Drivers.OpcUa/OpcUaDriver.cs b/src/Moryx.Drivers.OpcUa/OpcUaDriver.cs
@@ -29,9 +29,8 @@ namespace Moryx.Drivers.OpcUa;
 [Display(Name = nameof(Strings.OpcUaDriver_DisplayName), Description = nameof(Strings.OpcUaDriver_Description), ResourceType = typeof(Strings))]
 public class OpcUaDriver : Driver, IOpcUaDriver
 {
-    //TODO 6.1 Invoke Methods
-
     private const int NodeLayersShown = 5;
+
     /// <summary>
     /// Current tate of the driver
     /// </summary>
@@ -188,8 +187,8 @@ internal List<NodeIdAlias> NodeIdAlias
     internal ISession _session; //TODO: Internal field just for tests
     private SessionReconnectHandler _reconnectHandler;
 
-    private readonly object _lock = new();
-    private readonly object _stateLock = new();
+    private readonly Lock _lock = new();
+    private readonly Lock _stateLock = new();
 
     private Subscription _subscription;
 
@@ -452,10 +451,10 @@ public IMessageChannel Channel(string identifier)
     }
 
     /// <inheritdoc/>
-    public OpcUaNode GetNode(string identifier)
+    public OpcUaNode GetNode(string nodeId)
     {
-        var nodeId = OpcUaNode.CreateExpandedNodeId(GetNodeIdAsString(identifier));
-        if (!_nodesFlat.TryGetValue(nodeId, out var value))
+        var expandedNodeId = OpcUaNode.CreateExpandedNodeId(GetNodeIdAsString(nodeId));
+        if (!_nodesFlat.TryGetValue(expandedNodeId, out var value))
         {
             return null;
         }
@@ -764,11 +763,7 @@ private void BrowseNodes(NodeId nodeId, NamespaceTable namespaceTable, List<OpcU
 
             _savedIds.Add(node.Identifier);
 
-            if (!_nodesFlat.ContainsKey(node.Identifier))
-            {
-                _nodesFlat.Add(node.Identifier, node);
-            }
-
+            _nodesFlat.TryAdd(node.Identifier, node);
             if (layer < NodeLayersShown)
             {
                 list.Add(node);
@@ -864,7 +859,7 @@ private DataValueResult ReadNodeDataValue(string nodeId)
         {
             if (value.Error?.Exception != null)
             {
-                Logger.Log(LogLevel.Error, value.Error.Exception, value.Error?.Message);
+                Logger.Log(LogLevel.Error, value.Error.Exception, "Error reading node data.");
                 return null;
             }
         }
@@ -1044,7 +1039,7 @@ private object CreateValue(BuiltInType type, string stringValue)
     [EntrySerialize]
     internal List<string> FindNodeId(string displayName)
     {
-        var result = _nodesFlat.Where(x => x.Value.DisplayName.ToLower().Contains(displayName.ToLower()) || x.Value.DisplayName.ToLower().Equals(displayName.ToLower()))
+        var result = _nodesFlat.Where(x => x.Value.DisplayName.Contains(displayName, StringComparison.CurrentCultureIgnoreCase) || x.Value.DisplayName.ToLower().Equals(displayName.ToLower()))
             .Select(x => x.Key).ToList();
 
         return result;
diff --git a/src/Tests/Moryx.Drivers.OpcUa.Tests/DriverPropertiesTests.cs b/src/Tests/Moryx.Drivers.OpcUa.Tests/DriverPropertiesTests.cs
@@ -1,4 +1,5 @@
 // Copyright (c) 2025, Phoenix Contact GmbH & Co. KG
+// Licensed under the Apache License, Version 2.0
 
 using Microsoft.Extensions.Logging;
 using Moq;
@@ -28,7 +29,7 @@ public void DriverDoesntCrashWithInvalidServerUrl()
         //Arrange
         _driver.OpcUaServerUrl = "";
 
-        TestDelegate action = () => _driver.TryConnect(true).GetAwaiter().GetResult();
+        void action() => _driver.TryConnect(true).GetAwaiter().GetResult();
 
         //Assert
         Assert.DoesNotThrow(action);
diff --git a/src/Tests/Moryx.Drivers.OpcUa.Tests/HandlingCyclicNodesTests.cs b/src/Tests/Moryx.Drivers.OpcUa.Tests/HandlingCyclicNodesTests.cs
@@ -3,6 +3,7 @@
 
 using System.Text.Json;
 using Moq;
+using Moryx.AbstractionLayer.Drivers;
 using Moryx.Drivers.OpcUa.States;
 using Moryx.Modules;
 using Moryx.Tools;
@@ -75,7 +76,7 @@ public void DoNotShowDirectCyclicNodesInTheUi()
         var wait = new AutoResetEvent(false);
         _driver.StateChanged += (sender, e) =>
         {
-            if (e is RunningState)
+            if (e.Classification == StateClassification.Running)
             {
                 //Assert II
                 Assert.That(_driver.Nodes.Count, Is.EqualTo(1), "Number of browsed nodes doesn't fit");
@@ -123,7 +124,7 @@ public void DoNotShowIndirectCyclicNodesInTheUi()
         var wait = new AutoResetEvent(false);
         _driver.StateChanged += (sender, e) =>
         {
-            if (e is RunningState)
+            if (e.Classification == StateClassification.Running)
             {
                 //Assert II
                 var node = (OpcUaObjectDisplayNode)_driver.Nodes[0];
@@ -191,7 +192,7 @@ public void ShowSameNodeOnDifferentBranch()
         var wait = new AutoResetEvent(false);
         _driver.StateChanged += (sender, e) =>
         {
-            if (e is RunningState)
+            if (e.Classification == StateClassification.Running)
             {
                 //Assert II
                 Assert.That(_driver.Nodes.Count, Is.EqualTo(3), "Number of browsed nodes doesn't fit");
diff --git a/src/Tests/Moryx.Drivers.OpcUa.Tests/NodeHandlingTests.cs b/src/Tests/Moryx.Drivers.OpcUa.Tests/NodeHandlingTests.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0
 
 using Moq;
+using Moryx.AbstractionLayer.Drivers;
 using Moryx.Drivers.OpcUa.States;
 using Moryx.Modules;
 using NUnit.Framework;
@@ -35,7 +36,7 @@ public void TestBrowsingNodes()
         var wait = new AutoResetEvent(false);
         _driver.StateChanged += (sender, e) =>
         {
-            if (e is RunningState)
+            if (e.Classification == StateClassification.Running)
             {
                 //Assert II
                 Assert.That(_driver.Nodes, Has.Count.EqualTo(_rootNodes.Count), "Number of browsed nodes doesn't fit");
@@ -72,7 +73,7 @@ public void TestUpdatingNodeAfterBrowsing()
         var wait = new AutoResetEvent(false);
         _driver.StateChanged += (sender, e) =>
         {
-            if (e is RunningState)
+            if (e.Classification == StateClassification.Running)
             {
                 //Assert II
                 Assert.That(node?.DisplayName, Is.EqualTo(expectedNode.Value.DisplayName.Text));
@@ -110,7 +111,7 @@ public void TestSubscribingMonitoredItemsAfterBrowsing()
         var wait = new AutoResetEvent(false);
         _driver.StateChanged += (sender, e) =>
         {
-            if (e is RunningState)
+            if (e.Classification == StateClassification.Running)
             {
                 wait.Set();
             }
@@ -141,7 +142,7 @@ public void TestNodesCanOnlyBeSubscribedOnes()
         var wait = new AutoResetEvent(false);
         _driver.StateChanged += (sender, e) =>
         {
-            if (e is RunningState)
+            if (e.Classification == StateClassification.Running)
             {
                 wait.Set();
             }
@@ -172,7 +173,7 @@ public void TestSubcribedValueChanges()
         var waitSubscription3 = new AutoResetEvent(false);
         _driver.StateChanged += (sender, e) =>
         {
-            if (e is RunningState)
+            if (e.Classification == StateClassification.Running)
             {
                 wait.Set();
             }
diff --git a/src/Tests/Moryx.Drivers.OpcUa.Tests/NodeIdStringTests.cs b/src/Tests/Moryx.Drivers.OpcUa.Tests/NodeIdStringTests.cs
@@ -11,6 +11,11 @@ public class NodeIdStringTests : OpcUaTestBase
 {
     private new readonly NamespaceTable _namespaceTable = new(["http://opcfoundation.org/UA/", "http://anothernamespace.org/"]);
 
+    private const string NodeIdWithUriOnly = "nsu=http://anothernamespace.org/;i=2994";
+    private const string NodeIdWithNamespaceOnly = "ns=1;i=2994";
+    private const string NodeIdWithDefaultNamespaceOnly = "ns=0;i=2994";
+    private const string NodeIdWithUriAndIndex = "nsu=http://anothernamespace.org/;ns=1;i=2994";
+
     [SetUp]
     public void Setup()
     {
@@ -19,36 +24,28 @@ public void Setup()
     [Test]
     public void NamespaceIndexIsIgnoredWhenUriIsSpecified()
     {
-        var NodeIdWithUriAndIndex = "nsu=http://anothernamespace.org/;ns=1;i=2994";
-
         var nodeIdString = OpcUaNode.CreateExpandedNodeId(NodeIdWithUriAndIndex);
         Assert.That(nodeIdString, Is.EqualTo("nsu=http://anothernamespace.org/;i=2994"));
     }
 
     [Test]
     public void NamespaceUriIsUsedWhenIndexIsNotSpecified()
     {
-        var NodeIdWithUriOnly = "nsu=http://anothernamespace.org/;i=2994";
-
         var nodeIdString = OpcUaNode.CreateExpandedNodeId(NodeIdWithUriOnly);
         Assert.That(nodeIdString, Is.EqualTo("nsu=http://anothernamespace.org/;i=2994"));
     }
 
     [Test]
     public void NamespaceIndexIsUsedWhenUriIsNotSpecified()
     {
-        var NodeIdWithUriOnly = "ns=1;i=2994";
-
-        var nodeIdString = OpcUaNode.CreateExpandedNodeId(NodeIdWithUriOnly);
+        var nodeIdString = OpcUaNode.CreateExpandedNodeId(NodeIdWithNamespaceOnly);
         Assert.That(nodeIdString, Is.EqualTo("ns=1;i=2994"));
     }
 
     [Test]
     public void NamespaceIndexIgnoredWhenZeroAndUriIsNotSpecified()
     {
-        var NodeIdWithUriOnly = "ns=0;i=2994";
-
-        var nodeIdString = OpcUaNode.CreateExpandedNodeId(NodeIdWithUriOnly);
+        var nodeIdString = OpcUaNode.CreateExpandedNodeId(NodeIdWithDefaultNamespaceOnly);
         Assert.That(nodeIdString, Is.EqualTo("i=2994"));
     }
 
diff --git a/src/Tests/Moryx.Drivers.OpcUa.Tests/OpcUaTestBase.cs b/src/Tests/Moryx.Drivers.OpcUa.Tests/OpcUaTestBase.cs
@@ -16,13 +16,11 @@ public class OpcUaTestBase
     private const ushort IndexNamespace1 = 1;
     private const ushort IndexNamespace2 = 2;
 
-#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring as nullable.
     protected Mock<ISession> _sessionMock;
     protected Dictionary<NodeId, ReferenceDescription> _rootNodes;
     protected ReferenceDescription _root;
     protected NamespaceTable _namespaceTable = CreateNamespaceTable();
     protected OpcUaDriver _driver;
-#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring as nullable.
 
     protected static NamespaceTable CreateNamespaceTable()
     {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`// Copyright (c) 2025, Phoenix Contact GmbH & Co. KG`
	`2`	`+// Licensed under the Apache License, Version 2.0`
`2`	`3`
`3`	`4`	`using Microsoft.Extensions.Logging;`
	`5`	`+using Moryx.Drivers.OpcUa.Exceptions;`
`4`	`6`	`using Opc.Ua;`
`5`	`7`	`using Opc.Ua.Configuration;`
`6`	`8`
`@@ -40,7 +42,7 @@ public virtual async Task<ApplicationConfiguration> Create(ILogger logger, strin`
`40`	`42`	`var haveAppCertificate = await application.CheckApplicationInstanceCertificate(false, 0);`
`41`	`43`	`if (!haveAppCertificate)`
`42`	`44`	`{`
`43`		`- throw new Exception("Application instance certificate invalid!");`
	`45`	`+ throw new InvalidCertificateException("Application instance certificate invalid!");`
`44`	`46`	`}`
`45`	`47`	`else`
`46`	`48`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`// Licensed under the Apache License, Version 2.0`
`3`	`3`
`4`	`4`	`using System.Globalization;`
`5`		`-using System.Text.RegularExpressions;`
`6`	`5`	`using Microsoft.Extensions.Logging;`
`7`	`6`	`using Moryx.AbstractionLayer.Drivers;`
`8`	`7`	`using Moryx.AbstractionLayer.Drivers.Message;`
`@@ -82,6 +81,9 @@ public event EventHandler<object> Received`
`82`	`81`	`}`
`83`	`82`	`}`
`84`	`83`
	`84`	`+ /// <summary>`
	`85`	`+ /// Converts a NodeId string into an expanded NodeId string that matches the OPC UA specification;`
	`86`	`+ /// </summary>`
`85`	`87`	`public static string CreateExpandedNodeId(string nodeId)`
`86`	`88`	`{`
`87`	`89`	`var result = nodeId.Trim();`
`@@ -90,15 +92,18 @@ public static string CreateExpandedNodeId(string nodeId)`
`90`	`92`	`return result;`
`91`	`93`	`}`
`92`	`94`
`93`		`- private static string RemoveNamespaceIndexZero(string @string)`
	`95`	`+ private static string RemoveNamespaceIndexZero(string nodeId)`
`94`	`96`	`{`
`95`		`- if (@string.StartsWith("ns=0;"))`
	`97`	`+ if (nodeId.StartsWith("ns=0;"))`
`96`	`98`	`{`
`97`		`- return @string.Substring(5);`
	`99`	`+ return nodeId[5..];`
`98`	`100`	`}`
`99`		`- return @string;`
	`101`	`+ return nodeId;`
`100`	`102`	`}`
`101`	`103`
	`104`	`+ /// <summary>`
	`105`	`+ /// Converts a NodeId into an expanded NodeId string that matches the OPC UA specification;`
	`106`	`+ /// </summary>`
`102`	`107`	`public static string CreateExpandedNodeId(NodeId nodeId)`
`103`	`108`	`{`
`104`	`109`	`return CreateExpandedNodeId(nodeId.ToString());`
`@@ -114,17 +119,21 @@ private OpcUaNode(IOpcUaDriver driver, IModuleLogger logger)`
`114`	`119`
`115`	`120`	`}`
`116`	`121`
	`122`	`+ /// <inheritdoc />`
`117`	`123`	`public OpcUaNode(IOpcUaDriver driver, IModuleLogger logger, string namespaceUri, string nodeIdValue)`
`118`	`124`	`: this(driver, logger)`
`119`	`125`	`{`
`120`	`126`	`NodeId = new ExpandedNodeId(nodeIdValue, namespaceUri);`
`121`	`127`	`}`
`122`	`128`
	`129`	`+ /// <inheritdoc />`
`123`	`130`	`public OpcUaNode(IOpcUaDriver driver, IModuleLogger logger, ExpandedNodeId nodeId, NamespaceTable namespaceTable)`
`124`	`131`	`: this(driver, logger)`
`125`	`132`	`{`
`126`	`133`	`NodeId = new ExpandedNodeId(nodeId.Identifier, nodeId.NamespaceIndex, namespaceTable.GetString(nodeId.NamespaceIndex), nodeId.ServerIndex);`
`127`	`134`	`}`
	`135`	`+`
	`136`	`+ /// <inheritdoc />`
`128`	`137`	`public OpcUaNode(IOpcUaDriver driver, IModuleLogger logger, string identifier)`
`129`	`138`	`{`
`130`	`139`	`Driver = driver;`
`@@ -150,7 +159,7 @@ public void Send(object payload)`
`150`	`159`	`_logger?.Log(LogLevel.Error, "It is tried to read the value of node {NodeId}, but the node is no variable node", NodeId);`
`151`	`160`	`return;`
`152`	`161`	`}`
`153`		`- _driver.WriteNode(this.Identifier, payload);`
	`162`	`+ _driver.WriteNode(Identifier, payload);`
`154`	`163`	`}`
`155`	`164`
`156`	`165`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,5 @@ namespace Moryx.Drivers.OpcUa;`
`8`	`8`	`internal static partial class OpcUaNodeHelpers`
`9`	`9`	`{`
`10`	`10`	`[GeneratedRegex(";ns=\\d+")]`
`11`		`- public static partial Regex StringWithUriAndNamespaceIndex();`
	`11`	`+ public static partial Regex NodeIdWithNamespaceIndexRegex();`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,8 @@ namespace Moryx.Drivers.OpcUa;`
`29`	`29`	`[Display(Name = nameof(Strings.OpcUaDriver_DisplayName), Description = nameof(Strings.OpcUaDriver_Description), ResourceType = typeof(Strings))]`
`30`	`30`	`public class OpcUaDriver : Driver, IOpcUaDriver`
`31`	`31`	`{`
`32`		`- //TODO 6.1 Invoke Methods`
`33`		`-`
`34`	`32`	`private const int NodeLayersShown = 5;`
	`33`	`+`
`35`	`34`	`/// <summary>`
`36`	`35`	`/// Current tate of the driver`
`37`	`36`	`/// </summary>`
`@@ -188,8 +187,8 @@ internal List<NodeIdAlias> NodeIdAlias`
`188`	`187`	`internal ISession _session; //TODO: Internal field just for tests`
`189`	`188`	`private SessionReconnectHandler _reconnectHandler;`
`190`	`189`
`191`		`- private readonly object _lock = new();`
`192`		`- private readonly object _stateLock = new();`
	`190`	`+ private readonly Lock _lock = new();`
	`191`	`+ private readonly Lock _stateLock = new();`
`193`	`192`
`194`	`193`	`private Subscription _subscription;`
`195`	`194`
`@@ -452,10 +451,10 @@ public IMessageChannel Channel(string identifier)`
`452`	`451`	`}`
`453`	`452`
`454`	`453`	`/// <inheritdoc/>`
`455`		`- public OpcUaNode GetNode(string identifier)`
	`454`	`+ public OpcUaNode GetNode(string nodeId)`
`456`	`455`	`{`
`457`		`- var nodeId = OpcUaNode.CreateExpandedNodeId(GetNodeIdAsString(identifier));`
`458`		`- if (!_nodesFlat.TryGetValue(nodeId, out var value))`
	`456`	`+ var expandedNodeId = OpcUaNode.CreateExpandedNodeId(GetNodeIdAsString(nodeId));`
	`457`	`+ if (!_nodesFlat.TryGetValue(expandedNodeId, out var value))`
`459`	`458`	`{`
`460`	`459`	`return null;`
`461`	`460`	`}`
`@@ -764,11 +763,7 @@ private void BrowseNodes(NodeId nodeId, NamespaceTable namespaceTable, List<OpcU`
`764`	`763`
`765`	`764`	`_savedIds.Add(node.Identifier);`
`766`	`765`
`767`		`- if (!_nodesFlat.ContainsKey(node.Identifier))`
`768`		`- {`
`769`		`- _nodesFlat.Add(node.Identifier, node);`
`770`		`- }`
`771`		`-`
	`766`	`+ _nodesFlat.TryAdd(node.Identifier, node);`
`772`	`767`	`if (layer < NodeLayersShown)`
`773`	`768`	`{`
`774`	`769`	`list.Add(node);`
`@@ -864,7 +859,7 @@ private DataValueResult ReadNodeDataValue(string nodeId)`
`864`	`859`	`{`
`865`	`860`	`if (value.Error?.Exception != null)`
`866`	`861`	`{`
`867`		`- Logger.Log(LogLevel.Error, value.Error.Exception, value.Error?.Message);`
	`862`	`+ Logger.Log(LogLevel.Error, value.Error.Exception, "Error reading node data.");`
`868`	`863`	`return null;`
`869`	`864`	`}`
`870`	`865`	`}`
`@@ -1044,7 +1039,7 @@ private object CreateValue(BuiltInType type, string stringValue)`
`1044`	`1039`	`[EntrySerialize]`
`1045`	`1040`	`internal List<string> FindNodeId(string displayName)`
`1046`	`1041`	`{`
`1047`		`- var result = _nodesFlat.Where(x => x.Value.DisplayName.ToLower().Contains(displayName.ToLower()) \|\| x.Value.DisplayName.ToLower().Equals(displayName.ToLower()))`
	`1042`	`+ var result = _nodesFlat.Where(x => x.Value.DisplayName.Contains(displayName, StringComparison.CurrentCultureIgnoreCase) \|\| x.Value.DisplayName.ToLower().Equals(displayName.ToLower()))`
`1048`	`1043`	`.Select(x => x.Key).ToList();`
`1049`	`1044`
`1050`	`1045`	`return result;`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`
`4`	`4`	`using System.Text.Json;`
`5`	`5`	`using Moq;`
	`6`	`+using Moryx.AbstractionLayer.Drivers;`
`6`	`7`	`using Moryx.Drivers.OpcUa.States;`
`7`	`8`	`using Moryx.Modules;`
`8`	`9`	`using Moryx.Tools;`
`@@ -75,7 +76,7 @@ public void DoNotShowDirectCyclicNodesInTheUi()`
`75`	`76`	`var wait = new AutoResetEvent(false);`
`76`	`77`	`_driver.StateChanged += (sender, e) =>`
`77`	`78`	`{`
`78`		`- if (e is RunningState)`
	`79`	`+ if (e.Classification == StateClassification.Running)`
`79`	`80`	`{`
`80`	`81`	`//Assert II`
`81`	`82`	`Assert.That(_driver.Nodes.Count, Is.EqualTo(1), "Number of browsed nodes doesn't fit");`
`@@ -123,7 +124,7 @@ public void DoNotShowIndirectCyclicNodesInTheUi()`
`123`	`124`	`var wait = new AutoResetEvent(false);`
`124`	`125`	`_driver.StateChanged += (sender, e) =>`
`125`	`126`	`{`
`126`		`- if (e is RunningState)`
	`127`	`+ if (e.Classification == StateClassification.Running)`
`127`	`128`	`{`
`128`	`129`	`//Assert II`
`129`	`130`	`var node = (OpcUaObjectDisplayNode)_driver.Nodes[0];`
`@@ -191,7 +192,7 @@ public void ShowSameNodeOnDifferentBranch()`
`191`	`192`	`var wait = new AutoResetEvent(false);`
`192`	`193`	`_driver.StateChanged += (sender, e) =>`
`193`	`194`	`{`
`194`		`- if (e is RunningState)`
	`195`	`+ if (e.Classification == StateClassification.Running)`
`195`	`196`	`{`
`196`	`197`	`//Assert II`
`197`	`198`	`Assert.That(_driver.Nodes.Count, Is.EqualTo(3), "Number of browsed nodes doesn't fit");`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`// Licensed under the Apache License, Version 2.0`
`3`	`3`
`4`	`4`	`using Moq;`
	`5`	`+using Moryx.AbstractionLayer.Drivers;`
`5`	`6`	`using Moryx.Drivers.OpcUa.States;`
`6`	`7`	`using Moryx.Modules;`
`7`	`8`	`using NUnit.Framework;`
`@@ -35,7 +36,7 @@ public void TestBrowsingNodes()`
`35`	`36`	`var wait = new AutoResetEvent(false);`
`36`	`37`	`_driver.StateChanged += (sender, e) =>`
`37`	`38`	`{`
`38`		`- if (e is RunningState)`
	`39`	`+ if (e.Classification == StateClassification.Running)`
`39`	`40`	`{`
`40`	`41`	`//Assert II`
`41`	`42`	`Assert.That(_driver.Nodes, Has.Count.EqualTo(_rootNodes.Count), "Number of browsed nodes doesn't fit");`
`@@ -72,7 +73,7 @@ public void TestUpdatingNodeAfterBrowsing()`
`72`	`73`	`var wait = new AutoResetEvent(false);`
`73`	`74`	`_driver.StateChanged += (sender, e) =>`
`74`	`75`	`{`
`75`		`- if (e is RunningState)`
	`76`	`+ if (e.Classification == StateClassification.Running)`
`76`	`77`	`{`
`77`	`78`	`//Assert II`
`78`	`79`	`Assert.That(node?.DisplayName, Is.EqualTo(expectedNode.Value.DisplayName.Text));`
`@@ -110,7 +111,7 @@ public void TestSubscribingMonitoredItemsAfterBrowsing()`
`110`	`111`	`var wait = new AutoResetEvent(false);`
`111`	`112`	`_driver.StateChanged += (sender, e) =>`
`112`	`113`	`{`
`113`		`- if (e is RunningState)`
	`114`	`+ if (e.Classification == StateClassification.Running)`
`114`	`115`	`{`
`115`	`116`	`wait.Set();`
`116`	`117`	`}`
`@@ -141,7 +142,7 @@ public void TestNodesCanOnlyBeSubscribedOnes()`
`141`	`142`	`var wait = new AutoResetEvent(false);`
`142`	`143`	`_driver.StateChanged += (sender, e) =>`
`143`	`144`	`{`
`144`		`- if (e is RunningState)`
	`145`	`+ if (e.Classification == StateClassification.Running)`
`145`	`146`	`{`
`146`	`147`	`wait.Set();`
`147`	`148`	`}`
`@@ -172,7 +173,7 @@ public void TestSubcribedValueChanges()`
`172`	`173`	`var waitSubscription3 = new AutoResetEvent(false);`
`173`	`174`	`_driver.StateChanged += (sender, e) =>`
`174`	`175`	`{`
`175`		`- if (e is RunningState)`
	`176`	`+ if (e.Classification == StateClassification.Running)`
`176`	`177`	`{`
`177`	`178`	`wait.Set();`
`178`	`179`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,11 @@ public class NodeIdStringTests : OpcUaTestBase`
`11`	`11`	`{`
`12`	`12`	`private new readonly NamespaceTable _namespaceTable = new(["http://opcfoundation.org/UA/", "http://anothernamespace.org/"]);`
`13`	`13`
	`14`	`+ private const string NodeIdWithUriOnly = "nsu=http://anothernamespace.org/;i=2994";`
	`15`	`+ private const string NodeIdWithNamespaceOnly = "ns=1;i=2994";`
	`16`	`+ private const string NodeIdWithDefaultNamespaceOnly = "ns=0;i=2994";`
	`17`	`+ private const string NodeIdWithUriAndIndex = "nsu=http://anothernamespace.org/;ns=1;i=2994";`
	`18`	`+`
`14`	`19`	`[SetUp]`
`15`	`20`	`public void Setup()`
`16`	`21`	`{`
`@@ -19,36 +24,28 @@ public void Setup()`
`19`	`24`	`[Test]`
`20`	`25`	`public void NamespaceIndexIsIgnoredWhenUriIsSpecified()`
`21`	`26`	`{`
`22`		`- var NodeIdWithUriAndIndex = "nsu=http://anothernamespace.org/;ns=1;i=2994";`
`23`		`-`
`24`	`27`	`var nodeIdString = OpcUaNode.CreateExpandedNodeId(NodeIdWithUriAndIndex);`
`25`	`28`	`Assert.That(nodeIdString, Is.EqualTo("nsu=http://anothernamespace.org/;i=2994"));`
`26`	`29`	`}`
`27`	`30`
`28`	`31`	`[Test]`
`29`	`32`	`public void NamespaceUriIsUsedWhenIndexIsNotSpecified()`
`30`	`33`	`{`
`31`		`- var NodeIdWithUriOnly = "nsu=http://anothernamespace.org/;i=2994";`
`32`		`-`
`33`	`34`	`var nodeIdString = OpcUaNode.CreateExpandedNodeId(NodeIdWithUriOnly);`
`34`	`35`	`Assert.That(nodeIdString, Is.EqualTo("nsu=http://anothernamespace.org/;i=2994"));`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`[Test]`
`38`	`39`	`public void NamespaceIndexIsUsedWhenUriIsNotSpecified()`
`39`	`40`	`{`
`40`		`- var NodeIdWithUriOnly = "ns=1;i=2994";`
`41`		`-`
`42`		`- var nodeIdString = OpcUaNode.CreateExpandedNodeId(NodeIdWithUriOnly);`
	`41`	`+ var nodeIdString = OpcUaNode.CreateExpandedNodeId(NodeIdWithNamespaceOnly);`
`43`	`42`	`Assert.That(nodeIdString, Is.EqualTo("ns=1;i=2994"));`
`44`	`43`	`}`
`45`	`44`
`46`	`45`	`[Test]`
`47`	`46`	`public void NamespaceIndexIgnoredWhenZeroAndUriIsNotSpecified()`
`48`	`47`	`{`
`49`		`- var NodeIdWithUriOnly = "ns=0;i=2994";`
`50`		`-`
`51`		`- var nodeIdString = OpcUaNode.CreateExpandedNodeId(NodeIdWithUriOnly);`
	`48`	`+ var nodeIdString = OpcUaNode.CreateExpandedNodeId(NodeIdWithDefaultNamespaceOnly);`
`52`	`49`	`Assert.That(nodeIdString, Is.EqualTo("i=2994"));`
`53`	`50`	`}`
`54`	`51`