Files
Marc Schier a81d981755 dotnet format sweep (whitespace, IDE, RCS) + code-style enforcer agent fix (#3865)
# Description

Pure code-style sweep across the repo — no behavioral changes. Drives
`dotnet format` info-level diagnostics down on a large slice of the
codebase (Stack, Libraries, Tests, Tools).

Six commits, applied bottom-up in safety order so each batch leaves the
build green:

1. **`style: fix whitespace and final-newline formatting (WHITESPACE,
FINALNEWLINE)`**
   197 hits across ~30 files; pure mechanical cleanup.

2. **`style: apply dotnet format style fixes (IDE rules)`**
IDE-rule batch via `dotnet format style --severity info` —
`var`/explicit type, simplify names, collection expressions, expression
bodies, unused usings, etc.

3. **`style: apply dotnet format analyzers fixes (RCS blank-line
formatting)`**
   Roslynator formatting (RCS0xxx) blank-line and punctuation rules.

4. **`style: convert comments to doc comments and inline local vars
(RCS1181, RCS1124)`**
24 files. RCS1181 promotes `// summary`-style comments above
public/internal members to `/// <summary>` doc comments; RCS1124 inlines
locals used exactly once. Generated `Tools/` files were reverted to keep
the source-generator outputs deterministic.

5. **`docs(agent): correct --diagnostics flag form and verify Roslynator
4.x code fixers`**
Updates `.github/agents/opc-ua-codestyle-enforcer.agent.md` with two
corrections discovered while running this sweep:
- `dotnet format --diagnostics "RULE1 RULE2"` (single quoted,
space-separated) silently fixes nothing on `dotnet format` 10.x — it
parses as one unknown ID and exits 0. The correct form is `--diagnostics
RULE1 --diagnostics RULE2 …`, repeated per rule.
- Roslynator 4.15.0 **does** ship code fixers for
RCS1078/1118/1124/1140/1142/1181/1221/1260 (the previous "no auto-fixer"
list was outdated). RCS1140/1142 default to `Hidden` so need `--severity
info` to surface and fire; RCS1078 requires
`roslynator_empty_string_style = field` (already set in
`.editorconfig`). Only NUnit4002/2046/2010 genuinely lack auto-fixers in
this stack.

6. **`style: format new code from master merge (dotnet format sweep)`**
After merging master into the branch (commit `e3ebc8742`), re-ran the
same three-phase format sweep on the 151 .cs files brought in by the
merge, scoped per project via repeated `--include`. 81 files changed;
same rule families as commits 1–4.
- Hand-fixed `Tests/Opc.Ua.MigrationAnalyzer.Tests/AnalyzerHarness.cs`
for `RCS1174` (redundant `async`/`await` removal) because the auto-fixer
didn't apply for that specific case.
   - Reverted files that the formatter would break:
- `Libraries/Opc.Ua.Server/Server/ServerInternalData.cs` — multi-TFM
analysis disagreement injected `<<<<<<<` / `=======` / `>>>>>>>`
markers.
-
`Tools/Opc.Ua.MigrationAnalyzer.Core/{Core/Stack/Client/ChannelBase.cs,
Core/Stack/Types/IUserIdentityTokenHandler.cs,
Client/Session/Session.cs}` — IDE0005 removed `using
Opc.Ua.Security.Certificates` that IS used (the files are 1.5.378
reference fixtures for the analyzer).
- `Tests/Opc.Ua.Gds.Tests/PushTest.cs` — IDE0002 over-simplified
`OpcUa.ObjectTypeIds` to `ObjectTypeIds`, which then resolves to a
conflicting type.

### What this PR does **not** touch

- No behavioral or semantic logic changes.
- No `.editorconfig` rule promotions (rules stay at their current
severities; this is a backlog-burndown pass, not a rule tightening).
- Generated source under `Tools/` is intentionally excluded.
- Higher-risk rule families (`RCS1090`/`CA2007` `ConfigureAwait`,
`RCS1249` null-forgiving cleanup, `IDE0270`/`IDE0059`) are left for
follow-up sweeps because they need per-TFM build verification or
semantic review.

## Related Issues

_No tracking issue — this is a non-functional style sweep and the
agent-doc correction is a follow-up to the same work. Happy to open one
if the maintainers prefer._

## Checklist

- [ ] I have signed the
[CLA](https://opcfoundation.org/license/cla/ContributorLicenseAgreementv1.0.pdf)
and read the
[CONTRIBUTING](https://github.com/OPCFoundation/UA-.NETStandard/blob/master/CONTRIBUTING.md)
doc.
- [x] I have added tests that prove my fix is effective or that my
feature works and increased code coverage. _(N/A — style-only, no
behavioral change)_
- [x] I have added all necessary documentation. _(agent doc updated with
the two corrections)_
- [x] I have verified that my changes do not introduce (new) build or
analyzer warnings. _(verified clean on `net10.0` and `net48`; only
pre-existing `NETSDK1005`/`NETSDK1207` failures on Tools/AOT projects)_
- [ ] I ran **all** tests locally using the **UA.slnx** solution against
at least .net **framework** and .net **10**, and all passed. _(build
verified on net10 and net48 per batch; full test suite not yet run
locally — relying on CI)_
- [ ] I fixed **all** failing and flaky tests in the CI pipelines and
**all** CodeQL warnings.
- [ ] I have addressed **all** PR feedback received.

---------

Co-authored-by: agent <agent@local>
2026-06-10 08:35:44 +02:00

283 lines
12 KiB
C#

/* ========================================================================
* Copyright (c) 2005-2026 The OPC Foundation, Inc. All rights reserved.
*
* OPC Foundation MIT License 1.00
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
* files (the "Software"), to deal in the Software without
* restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following
* conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*
* The complete license agreement can be found here:
* http://opcfoundation.org/License/MIT/1.00/
* ======================================================================*/
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using Opc.Ua.Server;
namespace Opc.Ua.Gds.Server
{
/// <summary>
/// Interface for a node manager that manages
/// <c>ApplicationConfigurationType</c> instances under the
/// <c>ManagedApplications</c> folder per OPC 10000-12 §7.10.16.
/// </summary>
/// <remarks>
/// <para>
/// Implementations create <see cref="ApplicationConfigurationState"/>
/// instances for each managed application and expose them under the
/// well-known <c>ManagedApplications</c> folder. Each instance owns
/// a <see cref="ConfigurationFileState"/> that supports the
/// <c>CloseAndUpdate</c> / <c>ConfirmUpdate</c> transaction pattern
/// described in OPC 10000-12 §7.7.6.
/// </para>
/// <para>
/// The <see cref="StubManagedApplicationsNodeManager"/> provides a
/// minimal implementation that satisfies the model-level requirement
/// by exposing the <c>ManagedApplications</c> folder but returns
/// <c>Bad_NotSupported</c> for the configuration-file write
/// operations. Production systems should replace it with a
/// <see cref="DefaultManagedApplicationsNodeManager"/> (or a
/// custom implementation) that persists configuration data and
/// implements the full <c>ConfirmUpdate</c> transaction lifecycle
/// via an <see cref="IConfigurationDataStore"/>.
/// </para>
/// </remarks>
public interface IManagedApplicationsNodeManager : IAsyncNodeManager
{
/// <summary>
/// Gets the <see cref="IConfigurationDataStore"/> used for
/// persisting managed application configuration data, or
/// <c>null</c> if this node manager does not support
/// configuration persistence.
/// </summary>
IConfigurationDataStore? ConfigurationDataStore { get; }
}
/// <summary>
/// Stub implementation of <see cref="IManagedApplicationsNodeManager"/>
/// that exposes the <c>ManagedApplications</c> folder in the address
/// space and wires <c>ConfirmUpdate</c> with a
/// <c>Bad_NotSupported</c> response. A production GDS should replace
/// this stub with a <see cref="DefaultManagedApplicationsNodeManager"/>
/// or a custom implementation.
/// </summary>
public class StubManagedApplicationsNodeManager
: AsyncCustomNodeManager, IManagedApplicationsNodeManager
{
/// <summary>
/// Creates a new instance.
/// </summary>
public StubManagedApplicationsNodeManager(
IServerInternal server,
ApplicationConfiguration configuration)
: base(
server,
configuration,
server.Telemetry.CreateLogger<StubManagedApplicationsNodeManager>())
{
// The ManagedApplications folder lives under the
// ServerConfiguration object in the base UA namespace.
NamespaceUris = [Namespaces.OpcUa];
}
/// <inheritdoc/>
public IConfigurationDataStore? ConfigurationDataStore => null;
/// <inheritdoc/>
protected override ValueTask<NodeStateCollection> LoadPredefinedNodesAsync(
ISystemContext context,
CancellationToken cancellationToken = default)
{
// The ManagedApplications folder and its
// ApplicationConfigurationFolderType are defined in the
// base UA nodeset (StandardTypes.xml). They're loaded
// by the core node manager. This stub node manager does
// not contribute additional predefined nodes.
return new ValueTask<NodeStateCollection>([]);
}
/// <inheritdoc/>
public override async ValueTask CreateAddressSpaceAsync(
IDictionary<NodeId, IList<IReference>> externalReferences,
CancellationToken cancellationToken = default)
{
await base.CreateAddressSpaceAsync(externalReferences, cancellationToken).ConfigureAwait(false);
// The ManagedApplications folder is already part of the
// core UA nodeset. Future implementations would browse it
// here and populate ApplicationConfigurationType instances
// from a configuration database.
}
}
/// <summary>
/// Default implementation of <see cref="IManagedApplicationsNodeManager"/>
/// that queries an <see cref="IConfigurationDataStore"/> at startup,
/// creates <see cref="ApplicationConfigurationState"/> instances
/// under the <c>ManagedApplications</c> folder, and delegates
/// configuration read/write/confirm operations to the store.
/// </summary>
/// <remarks>
/// <para>
/// Plug in any <see cref="IConfigurationDataStore"/> implementation
/// (e.g. <see cref="InMemoryConfigurationDataStore"/> for testing or
/// a production database-backed store) to control how managed
/// application configuration data is persisted.
/// </para>
/// <para>
/// Each managed application is exposed as an
/// <see cref="ApplicationConfigurationState"/> node with its
/// <c>ApplicationUri</c>, <c>ProductUri</c>, <c>ApplicationType</c>,
/// and <c>Enabled</c> properties populated from
/// <see cref="ManagedApplicationInfo"/>.
/// </para>
/// </remarks>
public class DefaultManagedApplicationsNodeManager
: AsyncCustomNodeManager, IManagedApplicationsNodeManager
{
/// <summary>
/// Well-known NodeIds from the base UA namespace (ns=0).
/// Using numeric literals avoids ambiguity between the GDS and
/// base-UA generated ObjectTypes/Objects classes.
/// </summary>
private static readonly NodeId ManagedApplicationsFolderId = new(16706u);
private static readonly NodeId ApplicationConfigurationTypeId = new(25731u);
private readonly Dictionary<string, ApplicationConfigurationState> m_appNodes = new(System.StringComparer.Ordinal);
/// <summary>
/// Creates a new instance backed by the specified data store.
/// </summary>
/// <param name="server">The server instance.</param>
/// <param name="configuration">The application configuration.</param>
/// <param name="dataStore">
/// The configuration data store used to enumerate managed
/// applications and persist their configuration data.
/// </param>
public DefaultManagedApplicationsNodeManager(
IServerInternal server,
ApplicationConfiguration configuration,
IConfigurationDataStore dataStore)
: base(
server,
configuration,
server.Telemetry.CreateLogger<DefaultManagedApplicationsNodeManager>())
{
ConfigurationDataStore = dataStore ?? throw new System.ArgumentNullException(nameof(dataStore));
NamespaceUris = [Namespaces.OpcUa];
}
/// <inheritdoc/>
public IConfigurationDataStore ConfigurationDataStore { get; }
/// <inheritdoc/>
protected override ValueTask<NodeStateCollection> LoadPredefinedNodesAsync(
ISystemContext context,
CancellationToken cancellationToken = default)
{
// The ManagedApplications folder is defined in the base
// UA nodeset and loaded by the core node manager. We don't
// contribute additional predefined nodes here.
return new ValueTask<NodeStateCollection>([]);
}
/// <inheritdoc/>
public override async ValueTask CreateAddressSpaceAsync(
IDictionary<NodeId, IList<IReference>> externalReferences,
CancellationToken cancellationToken = default)
{
await base.CreateAddressSpaceAsync(externalReferences, cancellationToken).ConfigureAwait(false);
// Query the data store for managed applications and
// create ApplicationConfigurationState instances under the
// ManagedApplications folder.
IReadOnlyList<ManagedApplicationInfo> apps = await ConfigurationDataStore
.GetManagedApplicationsAsync(cancellationToken)
.ConfigureAwait(false);
foreach (ManagedApplicationInfo app in apps)
{
await CreateApplicationConfigurationNodeAsync(app, externalReferences).ConfigureAwait(false);
}
}
/// <summary>
/// Creates an <see cref="ApplicationConfigurationState"/> node
/// for the specified managed application and adds it to the
/// <c>ManagedApplications</c> folder.
/// </summary>
private async ValueTask CreateApplicationConfigurationNodeAsync(
ManagedApplicationInfo info,
IDictionary<NodeId, IList<IReference>> externalReferences)
{
// Build a deterministic NodeId from the ApplicationUri.
string safeId = info.ApplicationUri.Replace(':', '_').Replace('/', '_');
var nodeId = new NodeId(safeId, NamespaceIndexes[0]);
var appNode = new ApplicationConfigurationState(null)
{
NodeId = nodeId,
BrowseName = new QualifiedName(info.ApplicationUri, NamespaceIndexes[0]),
DisplayName = new LocalizedText(info.ApplicationUri),
TypeDefinitionId = ApplicationConfigurationTypeId,
WriteMask = AttributeWriteMask.None,
UserWriteMask = AttributeWriteMask.None
};
// Populate properties from the ManagedApplicationInfo.
appNode.ApplicationUri?.Value = info.ApplicationUri;
appNode.ProductUri?.Value = info.ProductUri ?? string.Empty;
appNode.ApplicationType?.Value = info.ApplicationType;
appNode.Enabled?.Value = info.Enabled;
appNode.IsNonUaApplication?.Value = info.IsNonUaApplication;
await AddPredefinedNodeAsync(SystemContext, appNode).ConfigureAwait(false);
// Wire an Organizes reference from the ManagedApplications
// folder to this node via the external-references dictionary
// (the folder is owned by the core node manager).
if (!externalReferences.TryGetValue(ManagedApplicationsFolderId, out IList<IReference>? refs))
{
refs = [];
externalReferences[ManagedApplicationsFolderId] = refs;
}
refs.Add(new NodeStateReference(
ReferenceTypeIds.Organizes,
false,
appNode.NodeId));
m_appNodes[info.ApplicationUri] = appNode;
}
/// <summary>
/// Gets the set of <see cref="ApplicationConfigurationState"/>
/// nodes managed by this node manager.
/// </summary>
public IReadOnlyDictionary<string, ApplicationConfigurationState> ApplicationNodes =>
m_appNodes;
}
}