mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-18 22:55:08 +08:00
a81d981755
# 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>
280 lines
12 KiB
C#
280 lines
12 KiB
C#
/* ========================================================================
|
|
* Copyright (c) 2005-2025 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.Threading;
|
|
using System.Threading.Tasks;
|
|
using Microsoft.Extensions.Logging;
|
|
using Opc.Ua.Server.NodeManager;
|
|
|
|
namespace Opc.Ua.Server.Fluent
|
|
{
|
|
/// <summary>
|
|
/// Opt-in base class for node managers that want to use the fluent
|
|
/// <c>Publish</c> surface (external event sources delivered through
|
|
/// <see cref="NodeState.ReportEvent"/>). The source-generator-emitted
|
|
/// <c>NodeManagerBase</c> derives from this class when any wrapper
|
|
/// in the design exposes a <c>Publish</c> binding; hand-written
|
|
/// managers can also derive directly.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// <para>
|
|
/// This class owns an <see cref="EventSourceRegistry"/> whose
|
|
/// reconcile loop runs as long as the manager is alive. Override
|
|
/// <see cref="OnSubscribeToEventsAsync"/> hooks the registry so it
|
|
/// activates and deactivates sources in lock-step with
|
|
/// <see cref="NodeState.AreEventsMonitored"/>. <c>Dispose(bool)</c>
|
|
/// tears the registry down before the base implementation runs so
|
|
/// no iterator outlives the manager.
|
|
/// </para>
|
|
/// <para>
|
|
/// Subclasses should never call into <see cref="EventSources"/>
|
|
/// outside the fluent builder pipeline; the surface is exposed for
|
|
/// generated code only.
|
|
/// </para>
|
|
/// </remarks>
|
|
public abstract class FluentNodeManagerBase : AsyncCustomNodeManager
|
|
{
|
|
/// <summary>
|
|
/// Initializes the node manager.
|
|
/// </summary>
|
|
protected FluentNodeManagerBase(
|
|
IServerInternal server,
|
|
params string[] namespaceUris)
|
|
: base(server, namespaceUris)
|
|
{
|
|
EventSources = new EventSourceRegistry(this, m_logger);
|
|
Simulations = new SimulationRegistry(this, m_logger);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Initializes the node manager.
|
|
/// </summary>
|
|
protected FluentNodeManagerBase(
|
|
IServerInternal server,
|
|
ILogger logger,
|
|
params string[] namespaceUris)
|
|
: base(server, logger, namespaceUris)
|
|
{
|
|
EventSources = new EventSourceRegistry(this, m_logger);
|
|
Simulations = new SimulationRegistry(this, m_logger);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Initializes the node manager.
|
|
/// </summary>
|
|
protected FluentNodeManagerBase(
|
|
IServerInternal server,
|
|
ApplicationConfiguration configuration,
|
|
params string[] namespaceUris)
|
|
: base(server, configuration, namespaceUris)
|
|
{
|
|
EventSources = new EventSourceRegistry(this, m_logger);
|
|
Simulations = new SimulationRegistry(this, m_logger);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Initializes the node manager.
|
|
/// </summary>
|
|
protected FluentNodeManagerBase(
|
|
IServerInternal server,
|
|
ApplicationConfiguration configuration,
|
|
ILogger logger,
|
|
params string[] namespaceUris)
|
|
: base(server, configuration, logger, namespaceUris)
|
|
{
|
|
EventSources = new EventSourceRegistry(this, m_logger);
|
|
Simulations = new SimulationRegistry(this, m_logger);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Initializes the node manager.
|
|
/// </summary>
|
|
protected FluentNodeManagerBase(
|
|
IServerInternal server,
|
|
ApplicationConfiguration configuration,
|
|
bool useSamplingGroups,
|
|
params string[] namespaceUris)
|
|
: base(server, configuration, useSamplingGroups, namespaceUris)
|
|
{
|
|
EventSources = new EventSourceRegistry(this, m_logger);
|
|
Simulations = new SimulationRegistry(this, m_logger);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Initializes the node manager.
|
|
/// </summary>
|
|
protected FluentNodeManagerBase(
|
|
IServerInternal server,
|
|
ApplicationConfiguration configuration,
|
|
bool useSamplingGroups,
|
|
ILogger logger,
|
|
params string[] namespaceUris)
|
|
: base(server, configuration, useSamplingGroups, logger, namespaceUris)
|
|
{
|
|
EventSources = new EventSourceRegistry(this, m_logger);
|
|
Simulations = new SimulationRegistry(this, m_logger);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Registry that the fluent <c>Publish</c> surface stores its
|
|
/// registered event sources in. Accessed by
|
|
/// <see cref="NodeManagerBuilder.AttachEventSources"/> during
|
|
/// <c>Configure</c> and by generated wrappers; not intended for
|
|
/// direct subclass use.
|
|
/// </summary>
|
|
internal EventSourceRegistry EventSources { get; }
|
|
|
|
/// <summary>
|
|
/// Registry that the fluent <c>Simulation</c> surface stores its
|
|
/// registered periodic tick loops in. Started after
|
|
/// <c>Configure</c> completes (via <c>NodeManagerBuilder.Seal</c>)
|
|
/// and torn down on disposal.
|
|
/// </summary>
|
|
internal SimulationRegistry Simulations { get; }
|
|
|
|
/// <summary>
|
|
/// Constructs a <see cref="NodeManagerBuilder"/> for this
|
|
/// manager and attaches the fluent event-source / simulation
|
|
/// registries in a single call. Hand-written managers use this
|
|
/// to collapse the imperative
|
|
/// <c>new NodeManagerBuilder(SystemContext, this, nsIndex, ...)</c>
|
|
/// + <c>AttachToBuilder(builder)</c> + <c>Configure(builder)</c>
|
|
/// + <c>builder.Seal()</c> quadruple to a single fluent chain:
|
|
/// <code>
|
|
/// this.CreateFluentBuilder(nsIndex)
|
|
/// .Configure(Configure)
|
|
/// .Seal();
|
|
/// </code>
|
|
/// The three root/nodeId/typeId lookups default to scanning the
|
|
/// manager's <see cref="CustomNodeManager2.PredefinedNodes"/>
|
|
/// dictionary, mirroring the resolver wiring that the
|
|
/// source-generated <c>NodeManagerBase.CreateAddressSpaceAsync</c>
|
|
/// emits.
|
|
/// </summary>
|
|
/// <param name="defaultNamespaceIndex">
|
|
/// Namespace index used when a browse-path segment omits an
|
|
/// explicit <c>ns=N;</c> prefix. Typically the manager's
|
|
/// model-specific namespace index.
|
|
/// </param>
|
|
/// <returns>
|
|
/// A configured <see cref="NodeManagerBuilder"/> ready to
|
|
/// receive <c>Configure(builder)</c> wiring; the fluent
|
|
/// extensions <see cref="FluentNodeManagerBuilderExtensions.Configure(NodeManagerBuilder, System.Action{INodeManagerBuilder})"/>
|
|
/// and <see cref="NodeManagerBuilder.Seal"/> chain off it.
|
|
/// </returns>
|
|
public NodeManagerBuilder CreateFluentBuilder(ushort defaultNamespaceIndex)
|
|
{
|
|
var builder = new NodeManagerBuilder(
|
|
SystemContext,
|
|
this,
|
|
defaultNamespaceIndex,
|
|
browseName => PredefinedNodes.Values.FindByBrowseName(browseName)!,
|
|
nodeId => PredefinedNodes.FindById(nodeId)!,
|
|
PredefinedNodes.Values.FindByTypeDefinition);
|
|
AttachToBuilder(builder);
|
|
return builder;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Attaches this manager's event-source registry to the supplied
|
|
/// fluent builder so that <c>Publish</c> extension methods can
|
|
/// resolve it. The generator-emitted <c>CreateAddressSpaceAsync</c>
|
|
/// invokes this immediately after constructing the builder; hand-
|
|
/// written managers that build their own
|
|
/// <see cref="NodeManagerBuilder"/> should call this once before
|
|
/// passing the builder into <c>Configure</c>.
|
|
/// </summary>
|
|
/// <param name="builder">
|
|
/// The fluent builder that the manager's <c>Configure</c>
|
|
/// partial(s) will receive.
|
|
/// </param>
|
|
/// <exception cref="System.ArgumentNullException">
|
|
/// Raised when <paramref name="builder"/> is <c>null</c>.
|
|
/// </exception>
|
|
public void AttachToBuilder(NodeManagerBuilder builder)
|
|
{
|
|
if (builder == null)
|
|
{
|
|
throw new System.ArgumentNullException(nameof(builder));
|
|
}
|
|
builder.AttachEventSources(EventSources);
|
|
builder.AttachSimulations(Simulations);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Signals the registry whenever a notifier's monitored-events
|
|
/// ref-count flips so the reconcile loop can start or stop the
|
|
/// matching iterator. Subclasses that further override
|
|
/// <see cref="AsyncCustomNodeManager.OnSubscribeToEventsAsync"/>
|
|
/// must call <c>base</c> before doing their own work.
|
|
/// </summary>
|
|
protected override ValueTask OnSubscribeToEventsAsync(
|
|
ServerSystemContext context,
|
|
MonitoredNode2 monitoredNode,
|
|
bool unsubscribe,
|
|
CancellationToken cancellationToken = default)
|
|
{
|
|
EventSources.SignalReconcile();
|
|
return base.OnSubscribeToEventsAsync(context, monitoredNode, unsubscribe, cancellationToken);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Cancels every running iterator and waits (bounded by each
|
|
/// source's
|
|
/// <see cref="EventPublishOptions.CancellationTimeout"/>) before
|
|
/// invoking the base disposer. Subclasses that further override
|
|
/// <c>Dispose</c> must call <c>base.Dispose(disposing)</c>.
|
|
/// </summary>
|
|
protected override void Dispose(bool disposing)
|
|
{
|
|
if (disposing)
|
|
{
|
|
Simulations.Dispose();
|
|
EventSources.Dispose();
|
|
}
|
|
base.Dispose(disposing);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Internal trampoline used by <see cref="EventSourceRegistry"/>
|
|
/// to register a notifier as a root notifier from a background
|
|
/// worker thread. Wraps
|
|
/// <see cref="AsyncCustomNodeManager.AddRootNotifierAsync"/>
|
|
/// so the registry does not have to know its protected
|
|
/// signature.
|
|
/// </summary>
|
|
internal Task AddRootNotifierFromFluentAsync(
|
|
NodeState notifier,
|
|
CancellationToken cancellationToken)
|
|
{
|
|
return AddRootNotifierAsync(notifier, cancellationToken).AsTask();
|
|
}
|
|
}
|
|
}
|