mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-19 07:02:16 +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>
304 lines
13 KiB
C#
304 lines
13 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;
|
|
using System.Collections.Generic;
|
|
using System.IO;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using Opc.Ua.Client.Subscriptions;
|
|
|
|
namespace Opc.Ua.Client
|
|
{
|
|
/// <summary>
|
|
/// Convenience extensions on <see cref="ManagedSession"/> for working
|
|
/// with the new options-based subscription API. These wrap plain
|
|
/// <see cref="Subscriptions.SubscriptionOptions"/> /
|
|
/// <see cref="Subscriptions.MonitoredItems.MonitoredItemOptions"/> snapshots into
|
|
/// <see cref="Microsoft.Extensions.Options.IOptionsMonitor{T}"/>
|
|
/// adapters so callers don't need to set up a DI options pipeline for
|
|
/// one-off use.
|
|
/// </summary>
|
|
public static class ManagedSessionExtensions
|
|
{
|
|
/// <summary>
|
|
/// Add a new subscription to the session using the supplied options
|
|
/// snapshot. The subscription is registered with
|
|
/// <see cref="ManagedSession.SubscriptionManager"/> and starts
|
|
/// asynchronously.
|
|
/// </summary>
|
|
/// <exception cref="ArgumentNullException"><paramref name="session"/> is <c>null</c>.</exception>
|
|
public static ISubscription AddSubscription(
|
|
this ManagedSession session,
|
|
ISubscriptionNotificationHandler handler,
|
|
Subscriptions.SubscriptionOptions options)
|
|
{
|
|
if (session == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(session));
|
|
}
|
|
if (handler == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(handler));
|
|
}
|
|
if (options == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(options));
|
|
}
|
|
var monitor = new OptionsMonitor<Subscriptions.SubscriptionOptions>(options);
|
|
return session.SubscriptionManager.Add(handler, monitor);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Add a new subscription to the session, configuring options via
|
|
/// a callback over a fresh <see cref="Subscriptions.SubscriptionOptions"/>
|
|
/// record.
|
|
/// </summary>
|
|
/// <exception cref="ArgumentNullException"><paramref name="session"/> is <c>null</c>.</exception>
|
|
public static ISubscription AddSubscription(
|
|
this ManagedSession session,
|
|
ISubscriptionNotificationHandler handler,
|
|
Func<Subscriptions.SubscriptionOptions, Subscriptions.SubscriptionOptions> configure)
|
|
{
|
|
if (session == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(session));
|
|
}
|
|
if (handler == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(handler));
|
|
}
|
|
if (configure == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(configure));
|
|
}
|
|
return session.AddSubscription(handler, configure(new Subscriptions.SubscriptionOptions()));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Add a monitored item to the subscription using the supplied
|
|
/// options snapshot.
|
|
/// </summary>
|
|
/// <exception cref="ArgumentNullException"><paramref name="subscription"/> is <c>null</c>.</exception>
|
|
/// <exception cref="ArgumentException"></exception>
|
|
public static bool TryAddMonitoredItem(
|
|
this ISubscription subscription,
|
|
string name,
|
|
Subscriptions.MonitoredItems.MonitoredItemOptions options,
|
|
out Subscriptions.MonitoredItems.IMonitoredItem? monitoredItem)
|
|
{
|
|
if (subscription == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(subscription));
|
|
}
|
|
if (string.IsNullOrEmpty(name))
|
|
{
|
|
throw new ArgumentException("name is required", nameof(name));
|
|
}
|
|
if (options == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(options));
|
|
}
|
|
var monitor = new OptionsMonitor<Subscriptions.MonitoredItems.MonitoredItemOptions>(options);
|
|
return subscription.MonitoredItems.TryAdd(name, monitor, out monitoredItem);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Add a monitored item to the subscription, configuring options
|
|
/// via a callback over a fresh
|
|
/// <see cref="Subscriptions.MonitoredItems.MonitoredItemOptions"/>
|
|
/// record initialized with the supplied node id.
|
|
/// </summary>
|
|
/// <exception cref="ArgumentNullException"><paramref name="subscription"/> is <c>null</c>.</exception>
|
|
/// <exception cref="ArgumentException"></exception>
|
|
public static bool TryAddMonitoredItem(
|
|
this ISubscription subscription,
|
|
string name,
|
|
NodeId nodeId,
|
|
Func<Subscriptions.MonitoredItems.MonitoredItemOptions, Subscriptions.MonitoredItems.MonitoredItemOptions> configure,
|
|
out Subscriptions.MonitoredItems.IMonitoredItem? monitoredItem)
|
|
{
|
|
if (subscription == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(subscription));
|
|
}
|
|
if (string.IsNullOrEmpty(name))
|
|
{
|
|
throw new ArgumentException("name is required", nameof(name));
|
|
}
|
|
if (configure == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(configure));
|
|
}
|
|
return subscription.TryAddMonitoredItem(
|
|
name,
|
|
configure(new Subscriptions.MonitoredItems.MonitoredItemOptions { StartNodeId = nodeId }),
|
|
out monitoredItem);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Persist every subscription managed by <paramref name="session"/>
|
|
/// (or a caller-supplied subset) to <paramref name="destination"/>
|
|
/// in OPC UA binary encoding. The format starts with the
|
|
/// session's namespace and server URI tables so the snapshot is
|
|
/// portable across sessions whose tables index URIs in different
|
|
/// positions.
|
|
/// </summary>
|
|
/// <param name="session">Session whose
|
|
/// <see cref="ManagedSession.SubscriptionManager"/> is being
|
|
/// snapshotted.</param>
|
|
/// <param name="destination">Writable destination stream.</param>
|
|
/// <param name="subscriptions">Optional subset of subscriptions
|
|
/// to include. When <c>null</c> every subscription currently
|
|
/// managed by <paramref name="session"/> is included.</param>
|
|
/// <param name="ct">Cancellation token.</param>
|
|
public static ValueTask SaveSubscriptionsAsync(
|
|
this ManagedSession session,
|
|
Stream destination,
|
|
IEnumerable<ISubscription>? subscriptions = null,
|
|
CancellationToken ct = default)
|
|
{
|
|
if (session == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(session));
|
|
}
|
|
return session.SubscriptionManager.SaveAsync(
|
|
destination, session.MessageContext, subscriptions, ct);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Restore subscriptions previously persisted by
|
|
/// <see cref="SaveSubscriptionsAsync"/>. Each restored subscription is
|
|
/// re-registered with
|
|
/// <see cref="ManagedSession.SubscriptionManager"/>.
|
|
/// </summary>
|
|
/// <param name="session">Session that owns the V2 subscription
|
|
/// manager and supplies the active message context.</param>
|
|
/// <param name="source">Readable source stream produced by
|
|
/// <see cref="SaveSubscriptionsAsync"/>.</param>
|
|
/// <param name="handlerFactory">Factory invoked once per
|
|
/// restored subscription to construct the application's
|
|
/// <see cref="ISubscriptionNotificationHandler"/>. The factory
|
|
/// receives the per-subscription stable name captured in the
|
|
/// snapshot.</param>
|
|
/// <param name="transferSubscriptions">When <c>true</c> the
|
|
/// restored subscriptions take over the original server-side
|
|
/// state via <c>TransferSubscriptions</c>; if that fails for any
|
|
/// subscription the V2 manager falls back to recreate.</param>
|
|
/// <param name="ct">Cancellation token.</param>
|
|
public static ValueTask<IReadOnlyList<ISubscription>> LoadSubscriptionsAsync(
|
|
this ManagedSession session, Stream source,
|
|
Func<string, ISubscriptionNotificationHandler> handlerFactory,
|
|
bool transferSubscriptions = false, CancellationToken ct = default)
|
|
{
|
|
if (session == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(session));
|
|
}
|
|
return session.SubscriptionManager.LoadAsync(source,
|
|
session.MessageContext, handlerFactory,
|
|
transferSubscriptions, ct);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Capture an in-memory snapshot of every subscription managed
|
|
/// by <paramref name="session"/>. The returned list of
|
|
/// <see cref="SubscriptionStateSnapshot"/>s can be persisted by
|
|
/// the caller in any format and later passed to
|
|
/// <see cref="RestoreSubscriptionsAsync"/>.
|
|
/// </summary>
|
|
public static IReadOnlyList<SubscriptionStateSnapshot> SnapshotSubscriptions(
|
|
this ManagedSession session)
|
|
{
|
|
if (session == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(session));
|
|
}
|
|
var result = new List<SubscriptionStateSnapshot>();
|
|
foreach (ISubscription s in session.SubscriptionManager.Items)
|
|
{
|
|
if (s is Subscriptions.Subscription concrete)
|
|
{
|
|
result.Add(concrete.Snapshot());
|
|
}
|
|
}
|
|
return result;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Restore a list of <see cref="SubscriptionStateSnapshot"/>s
|
|
/// previously captured by <see cref="SnapshotSubscriptions"/>.
|
|
/// </summary>
|
|
/// <param name="session">Session that owns the V2 subscription
|
|
/// manager.</param>
|
|
/// <param name="states">Snapshots to restore.</param>
|
|
/// <param name="handlerFactory">Factory invoked once per
|
|
/// snapshot to construct the application's notification
|
|
/// handler. The factory receives the snapshot itself so callers
|
|
/// can route by options or per-item metadata.</param>
|
|
/// <param name="transferSubscriptions">When <c>true</c> the
|
|
/// restored subscriptions take over the original server-side
|
|
/// state via <c>TransferSubscriptions</c>; if that fails for
|
|
/// any subscription the V2 manager falls back to recreate.</param>
|
|
/// <param name="ct">Cancellation token.</param>
|
|
public static async ValueTask<IReadOnlyList<ISubscription>> RestoreSubscriptionsAsync(
|
|
this ManagedSession session,
|
|
IReadOnlyList<SubscriptionStateSnapshot> states,
|
|
Func<SubscriptionStateSnapshot, ISubscriptionNotificationHandler> handlerFactory,
|
|
bool transferSubscriptions = false,
|
|
CancellationToken ct = default)
|
|
{
|
|
if (session == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(session));
|
|
}
|
|
if (states == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(states));
|
|
}
|
|
if (handlerFactory == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(handlerFactory));
|
|
}
|
|
var result = new List<ISubscription>(states.Count);
|
|
SubscriptionManager manager =
|
|
(SubscriptionManager)session.SubscriptionManager;
|
|
foreach (SubscriptionStateSnapshot state in states)
|
|
{
|
|
result.Add(await manager.RestoreAsync(
|
|
handlerFactory(state),
|
|
state,
|
|
transferSubscriptions,
|
|
ct).ConfigureAwait(false));
|
|
}
|
|
return result;
|
|
}
|
|
}
|
|
}
|