Set namespace of new classes/interfaces into the main project namespace

wbtoms · wbtoms · commit 3532fa157792 · 2025-03-13T16:17:57.000+01:00
diff --git a/Applications/ConsoleReferenceServer/Program.cs b/Applications/ConsoleReferenceServer/Program.cs
@@ -36,8 +36,7 @@
 using Microsoft.Extensions.Logging;
 using Opc.Ua;
 using Opc.Ua.Configuration;
-using Opc.Ua.Configuration.Extensions.DependencyInjection;
-using Opc.Ua.Server.Extensions.DependencyInjection;
+using Opc.Ua.Server;
 
 namespace Quickstarts.ReferenceServer
 {
diff --git a/Applications/Quickstarts.Servers/ReferenceServer/ReferenceServer.cs b/Applications/Quickstarts.Servers/ReferenceServer/ReferenceServer.cs
@@ -34,7 +34,6 @@
 using Opc.Ua;
 using Opc.Ua.Configuration;
 using Opc.Ua.Server;
-using Opc.Ua.Server.NodeManager;
 
 namespace Quickstarts.ReferenceServer
 {
diff --git a/Libraries/Opc.Ua.Configuration/Extensions/DependencyInjection/ServiceCollectionExtensions.cs b/Libraries/Opc.Ua.Configuration/Extensions/DependencyInjection/ServiceCollectionExtensions.cs
@@ -29,7 +29,7 @@
 
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Opc.Ua.Configuration.Extensions.DependencyInjection
+namespace Opc.Ua.Configuration
 {
     /// <summary>
     /// Class that provides service collection extensions to setup dependency injection
diff --git a/Libraries/Opc.Ua.Gds.Server.Common/GlobalDiscoverySampleServer.cs b/Libraries/Opc.Ua.Gds.Server.Common/GlobalDiscoverySampleServer.cs
@@ -35,7 +35,6 @@
 using Opc.Ua.Gds.Server.Database;
 using Opc.Ua.Security.Certificates;
 using Opc.Ua.Server;
-using Opc.Ua.Server.NodeManager;
 using Opc.Ua.Server.UserDatabase;
 
 namespace Opc.Ua.Gds.Server
diff --git a/Libraries/Opc.Ua.Server/Extensions/DependencyInjection/ServiceCollectionExtensions.cs b/Libraries/Opc.Ua.Server/Extensions/DependencyInjection/ServiceCollectionExtensions.cs
@@ -28,10 +28,8 @@
  * ======================================================================*/
 
 using Microsoft.Extensions.DependencyInjection;
-using Opc.Ua.Configuration.Extensions.DependencyInjection;
-using Opc.Ua.Server.NodeManager;
 
-namespace Opc.Ua.Server.Extensions.DependencyInjection
+namespace Opc.Ua.Server
 {
     /// <summary>
     /// Class that provides service collection extensions to setup dependency injection
diff --git a/Libraries/Opc.Ua.Server/NodeManager/IMainNodeManagerFactory.cs b/Libraries/Opc.Ua.Server/NodeManager/IMainNodeManagerFactory.cs
@@ -27,7 +27,7 @@
  * http://opcfoundation.org/License/MIT/1.00/
  * ======================================================================*/
 
-namespace Opc.Ua.Server.NodeManager
+namespace Opc.Ua.Server
 {
     /// <summary>
     /// Interface of the core node manager factory which helps creating main
diff --git a/Libraries/Opc.Ua.Server/NodeManager/MainNodeManagerFactory.cs b/Libraries/Opc.Ua.Server/NodeManager/MainNodeManagerFactory.cs
@@ -29,7 +29,7 @@
 
 using Opc.Ua.Configuration;
 
-namespace Opc.Ua.Server.NodeManager
+namespace Opc.Ua.Server
 {
     internal class MainNodeManagerFactory : IMainNodeManagerFactory
     {
diff --git a/Libraries/Opc.Ua.Server/NodeManager/MasterNodeManager.cs b/Libraries/Opc.Ua.Server/NodeManager/MasterNodeManager.cs
@@ -31,7 +31,6 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading;
-using Opc.Ua.Server.NodeManager;
 
 namespace Opc.Ua.Server
 {
diff --git a/Libraries/Opc.Ua.Server/Server/ReverseConnectServer.cs b/Libraries/Opc.Ua.Server/Server/ReverseConnectServer.cs
@@ -33,7 +33,6 @@
 using System.Linq;
 using System.Threading;
 using Opc.Ua.Configuration;
-using Opc.Ua.Server.NodeManager;
 
 namespace Opc.Ua.Server
 {
diff --git a/Libraries/Opc.Ua.Server/Server/StandardServer.cs b/Libraries/Opc.Ua.Server/Server/StandardServer.cs
@@ -37,7 +37,6 @@
 using System.Threading;
 using Opc.Ua.Bindings;
 using Opc.Ua.Configuration;
-using Opc.Ua.Server.NodeManager;
 using static Opc.Ua.Utils;
 
 namespace Opc.Ua.Server
diff --git a/Tests/Opc.Ua.Client.ComplexTypes.Tests/TypeSystemClientTest.cs b/Tests/Opc.Ua.Client.ComplexTypes.Tests/TypeSystemClientTest.cs
@@ -39,8 +39,7 @@
 using NUnit.Framework;
 using Opc.Ua.Client.Tests;
 using Opc.Ua.Configuration;
-using Opc.Ua.Configuration.Extensions.DependencyInjection;
-using Opc.Ua.Server.Extensions.DependencyInjection;
+using Opc.Ua.Server;
 using Opc.Ua.Server.Tests;
 using Quickstarts;
 using Quickstarts.ReferenceServer;
diff --git a/Tests/Opc.Ua.Client.Tests/ClientTestFramework.cs b/Tests/Opc.Ua.Client.Tests/ClientTestFramework.cs
@@ -32,15 +32,12 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 using NUnit.Framework;
 using Opc.Ua.Configuration;
-using Opc.Ua.Configuration.Extensions.DependencyInjection;
-using Opc.Ua.Server.Extensions.DependencyInjection;
+using Opc.Ua.Server;
 using Opc.Ua.Server.Tests;
 using Quickstarts.ReferenceServer;
 using Assert = NUnit.Framework.Legacy.ClassicAssert;
diff --git a/Tests/Opc.Ua.Client.Tests/ClientTestServerQuotas.cs b/Tests/Opc.Ua.Client.Tests/ClientTestServerQuotas.cs
@@ -29,22 +29,14 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Security.Cryptography.X509Certificates;
-using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
 using Microsoft.Extensions.DependencyInjection;
-using Moq;
 using NUnit.Framework;
-using Opc.Ua.Bindings;
 using Opc.Ua.Configuration;
-using Opc.Ua.Configuration.Extensions.DependencyInjection;
-using Opc.Ua.Server.Extensions.DependencyInjection;
+using Opc.Ua.Server;
 using Opc.Ua.Server.Tests;
 using Quickstarts.ReferenceServer;
 using Assert = NUnit.Framework.Legacy.ClassicAssert;
diff --git a/Tests/Opc.Ua.Client.Tests/ContinuationPointInBatchTest.cs b/Tests/Opc.Ua.Client.Tests/ContinuationPointInBatchTest.cs
@@ -31,20 +31,15 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
 using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;
-using NUnit.Framework.Internal;
 using Opc.Ua.Configuration;
-using Opc.Ua.Configuration.Extensions.DependencyInjection;
 using Opc.Ua.Server;
-using Opc.Ua.Server.Extensions.DependencyInjection;
 using Opc.Ua.Server.Tests;
-using Quickstarts.ReferenceServer;
 using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 
diff --git a/Tests/Opc.Ua.Client.Tests/DurableSubscriptionTest.cs b/Tests/Opc.Ua.Client.Tests/DurableSubscriptionTest.cs
@@ -28,23 +28,16 @@
  * ======================================================================*/
 
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Reflection;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
-using BenchmarkDotNet.Configs;
-using CommandLine;
 using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;
 using Opc.Ua.Configuration;
-using Opc.Ua.Configuration.Extensions.DependencyInjection;
-using Opc.Ua.Server.Extensions.DependencyInjection;
+using Opc.Ua.Server;
 using Opc.Ua.Server.Tests;
 using Quickstarts.ReferenceServer;
 using Assert = NUnit.Framework.Legacy.ClassicAssert;
diff --git a/Tests/Opc.Ua.Client.Tests/ReferenceServerWithLimits.cs b/Tests/Opc.Ua.Client.Tests/ReferenceServerWithLimits.cs
@@ -32,7 +32,6 @@
 using System.Security.Cryptography.X509Certificates;
 using Opc.Ua.Configuration;
 using Opc.Ua.Server;
-using Opc.Ua.Server.NodeManager;
 using Quickstarts.ReferenceServer;
 
 namespace Opc.Ua.Client.Tests
diff --git a/Tests/Opc.Ua.Client.Tests/ReverseConnectTest.cs b/Tests/Opc.Ua.Client.Tests/ReverseConnectTest.cs
@@ -36,8 +36,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;
 using Opc.Ua.Configuration;
-using Opc.Ua.Configuration.Extensions.DependencyInjection;
-using Opc.Ua.Server.Extensions.DependencyInjection;
+using Opc.Ua.Server;
 using Opc.Ua.Server.Tests;
 using Quickstarts.ReferenceServer;
 using Assert = NUnit.Framework.Legacy.ClassicAssert;
diff --git a/Tests/Opc.Ua.Gds.Tests/Common.cs b/Tests/Opc.Ua.Gds.Tests/Common.cs
@@ -32,15 +32,11 @@
 using System.Globalization;
 using System.IO;
 using System.Text.RegularExpressions;
-using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using Opc.Ua.Configuration;
-using Opc.Ua.Configuration.Extensions.DependencyInjection;
 using Opc.Ua.Gds.Client;
 using Opc.Ua.Server;
-using Opc.Ua.Server.Extensions.DependencyInjection;
-using Opc.Ua.Server.NodeManager;
 using Opc.Ua.Server.Tests;
 using Opc.Ua.Test;
 
diff --git a/Tests/Opc.Ua.Gds.Tests/GlobalDiscoveryTestServer.cs b/Tests/Opc.Ua.Gds.Tests/GlobalDiscoveryTestServer.cs
@@ -35,7 +35,6 @@
 using Opc.Ua.Gds.Server;
 using Opc.Ua.Gds.Server.Database.Linq;
 using Opc.Ua.Server;
-using Opc.Ua.Server.NodeManager;
 using Opc.Ua.Server.UserDatabase;
 
 namespace Opc.Ua.Gds.Tests
diff --git a/Tests/Opc.Ua.Server.Tests/CustomNodeManagerTests.cs b/Tests/Opc.Ua.Server.Tests/CustomNodeManagerTests.cs
@@ -5,9 +5,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;
 using Opc.Ua.Configuration;
-using Opc.Ua.Configuration.Extensions.DependencyInjection;
-using Opc.Ua.Server.Extensions.DependencyInjection;
-using Quickstarts.ReferenceServer;
 
 namespace Opc.Ua.Server.Tests
 {
diff --git a/Tests/Opc.Ua.Server.Tests/MasterNodeManagerTests.cs b/Tests/Opc.Ua.Server.Tests/MasterNodeManagerTests.cs
@@ -34,10 +34,6 @@
 using Moq;
 using NUnit.Framework;
 using Opc.Ua.Configuration;
-using Opc.Ua.Configuration.Extensions.DependencyInjection;
-using Opc.Ua.Server.Extensions.DependencyInjection;
-using Opc.Ua.Server.NodeManager;
-using Quickstarts.ReferenceServer;
 using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Opc.Ua.Server.Tests
diff --git a/Tests/Opc.Ua.Server.Tests/ReferenceServerTest.cs b/Tests/Opc.Ua.Server.Tests/ReferenceServerTest.cs
@@ -35,8 +35,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;
 using Opc.Ua.Configuration;
-using Opc.Ua.Configuration.Extensions.DependencyInjection;
-using Opc.Ua.Server.Extensions.DependencyInjection;
 using Opc.Ua.Test;
 using Quickstarts.ReferenceServer;
 using Assert = NUnit.Framework.Legacy.ClassicAssert;
diff --git a/Tests/Opc.Ua.Server.Tests/ServerStartupTests.cs b/Tests/Opc.Ua.Server.Tests/ServerStartupTests.cs
@@ -32,9 +32,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;
 using Opc.Ua.Configuration;
-using Opc.Ua.Configuration.Extensions.DependencyInjection;
-using Opc.Ua.Server.Extensions.DependencyInjection;
-using Quickstarts.ReferenceServer;
 using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Opc.Ua.Server.Tests

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,7 @@`
`36`	`36`	`using Microsoft.Extensions.Logging;`
`37`	`37`	`using Opc.Ua;`
`38`	`38`	`using Opc.Ua.Configuration;`
`39`		`-using Opc.Ua.Configuration.Extensions.DependencyInjection;`
`40`		`-using Opc.Ua.Server.Extensions.DependencyInjection;`
	`39`	`+using Opc.Ua.Server;`
`41`	`40`
`42`	`41`	`namespace Quickstarts.ReferenceServer`
`43`	`42`	`{`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@`
`34`	`34`	`using Opc.Ua;`
`35`	`35`	`using Opc.Ua.Configuration;`
`36`	`36`	`using Opc.Ua.Server;`
`37`		`-using Opc.Ua.Server.NodeManager;`
`38`	`37`
`39`	`38`	`namespace Quickstarts.ReferenceServer`
`40`	`39`	`{`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`
`30`	`30`	`using Microsoft.Extensions.DependencyInjection;`
`31`	`31`
`32`		`-namespace Opc.Ua.Configuration.Extensions.DependencyInjection`
	`32`	`+namespace Opc.Ua.Configuration`
`33`	`33`	`{`
`34`	`34`	`/// <summary>`
`35`	`35`	`/// Class that provides service collection extensions to setup dependency injection`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`* http://opcfoundation.org/License/MIT/1.00/`
`28`	`28`	`* ======================================================================*/`
`29`	`29`
`30`		`-namespace Opc.Ua.Server.NodeManager`
	`30`	`+namespace Opc.Ua.Server`
`31`	`31`	`{`
`32`	`32`	`/// <summary>`
`33`	`33`	`/// Interface of the core node manager factory which helps creating main`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,6 @@`
`31`	`31`	`using System.Collections.Generic;`
`32`	`32`	`using System.Diagnostics;`
`33`	`33`	`using System.Threading;`
`34`		`-using Opc.Ua.Server.NodeManager;`
`35`	`34`
`36`	`35`	`namespace Opc.Ua.Server`
`37`	`36`	`{`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@`
`33`	`33`	`using System.Linq;`
`34`	`34`	`using System.Threading;`
`35`	`35`	`using Opc.Ua.Configuration;`
`36`		`-using Opc.Ua.Server.NodeManager;`
`37`	`36`
`38`	`37`	`namespace Opc.Ua.Server`
`39`	`38`	`{`