mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-20 16:52:07 +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>
187 lines
7.8 KiB
C#
187 lines
7.8 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.Globalization;
|
|
using System.IO;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
|
|
namespace Opc.Ua.Client.Subscriptions
|
|
{
|
|
/// <summary>
|
|
/// Save / Load support for the V2 <see cref="SubscriptionManager"/>.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// <para>
|
|
/// The on-wire format is the OPC UA <see cref="BinaryEncoder"/> format.
|
|
/// Each subscription is captured as a
|
|
/// <see cref="SubscriptionStateSnapshot"/> — an
|
|
/// <see cref="IEncodeable"/> emitted by the
|
|
/// <see cref="DataTypeAttribute"/> source generator — and written
|
|
/// directly via <see cref="IEncoder.WriteEncodeable{T}(string, T)"/>.
|
|
/// The reader instantiates <see cref="SubscriptionStateSnapshot"/>
|
|
/// statically by type (no <see cref="ExpandedNodeId"/> lookup is
|
|
/// required because the wire schema is implicit in the call site).
|
|
/// Future schema evolution is handled by adding new optional fields
|
|
/// to the snapshot record — they are encoded only when set and
|
|
/// recognized via <see cref="IDecoder.HasField(string)"/> by the
|
|
/// reader.
|
|
/// </para>
|
|
/// <para>
|
|
/// The stream still preserves the source session's namespace and
|
|
/// server URI tables so the snapshot is portable across sessions
|
|
/// whose tables index URIs at different positions; the loader
|
|
/// remaps those indices into the target session's tables before
|
|
/// decoding each snapshot's <c>NodeId</c> fields.
|
|
/// </para>
|
|
/// </remarks>
|
|
internal static class SubscriptionManagerSerializer
|
|
{
|
|
#pragma warning disable RCS1229 // Use async/await when necessary - this path is synchronous; ValueTask wraps work for future async I/O
|
|
public static ValueTask SaveAsync(
|
|
SubscriptionManager manager,
|
|
Stream stream,
|
|
IServiceMessageContext messageContext,
|
|
IEnumerable<ISubscription>? subscriptions,
|
|
CancellationToken ct = default)
|
|
#pragma warning restore RCS1229
|
|
{
|
|
ct.ThrowIfCancellationRequested();
|
|
if (manager == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(manager));
|
|
}
|
|
if (stream == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(stream));
|
|
}
|
|
if (messageContext == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(messageContext));
|
|
}
|
|
|
|
// Capture a snapshot per selected subscription. Default =
|
|
// all subscriptions managed by this instance. Snapshot is
|
|
// taken from the concrete subscription type.
|
|
IEnumerable<ISubscription> selected =
|
|
subscriptions ?? manager.Items;
|
|
var snapshots = new List<SubscriptionStateSnapshot>();
|
|
foreach (ISubscription s in selected)
|
|
{
|
|
if (s is Subscription concrete)
|
|
{
|
|
snapshots.Add(concrete.Snapshot());
|
|
}
|
|
}
|
|
|
|
using var encoder = new BinaryEncoder(stream, messageContext, true);
|
|
encoder.WriteStringArray(null, messageContext.NamespaceUris.ToArrayOf());
|
|
encoder.WriteStringArray(null, messageContext.ServerUris.ToArrayOf());
|
|
encoder.WriteInt32(null, snapshots.Count);
|
|
foreach (SubscriptionStateSnapshot snapshot in snapshots)
|
|
{
|
|
// Write the snapshot directly as an IEncodeable.
|
|
// Schema identity is statically encoded by the call site
|
|
// (we always read back a SubscriptionStateSnapshot); schema
|
|
// evolution is handled by adding new optional fields with
|
|
// CanOmitFields-aware encoding.
|
|
encoder.WriteEncodeable(null, snapshot);
|
|
}
|
|
return default;
|
|
}
|
|
|
|
public static async ValueTask<IReadOnlyList<ISubscription>> LoadAsync(
|
|
SubscriptionManager manager,
|
|
Stream stream,
|
|
IServiceMessageContext messageContext,
|
|
Func<string, ISubscriptionNotificationHandler> handlerFactory,
|
|
bool transferSubscriptions,
|
|
CancellationToken ct)
|
|
{
|
|
if (manager == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(manager));
|
|
}
|
|
if (stream == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(stream));
|
|
}
|
|
if (messageContext == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(messageContext));
|
|
}
|
|
if (handlerFactory == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(handlerFactory));
|
|
}
|
|
|
|
using var decoder = new BinaryDecoder(stream, messageContext, true);
|
|
ArrayOf<string?> nsUris = decoder.ReadStringArray(null);
|
|
ArrayOf<string?> serverUris = decoder.ReadStringArray(null);
|
|
decoder.SetMappingTables(
|
|
nsUris.IsNull
|
|
? new NamespaceTable()
|
|
: new NamespaceTable(nsUris.Memory.ToArray()!),
|
|
serverUris.IsNull
|
|
? new StringTable()
|
|
: new StringTable(serverUris.Memory.ToArray()!));
|
|
|
|
int count = decoder.ReadInt32(null);
|
|
if (count <= 0)
|
|
{
|
|
return [];
|
|
}
|
|
|
|
var restored = new List<ISubscription>(count);
|
|
for (int i = 0; i < count; i++)
|
|
{
|
|
ct.ThrowIfCancellationRequested();
|
|
// Schema identity is implicit in the call: we always
|
|
// read a SubscriptionStateSnapshot. Future schema evolution
|
|
// happens by adding optional fields recognized via
|
|
// HasField on the decoder side.
|
|
SubscriptionStateSnapshot state =
|
|
decoder.ReadEncodeable<SubscriptionStateSnapshot>(null);
|
|
string syntheticName = i.ToString(CultureInfo.InvariantCulture);
|
|
ISubscriptionNotificationHandler handler =
|
|
handlerFactory(syntheticName);
|
|
ISubscription subscription = await manager.RestoreAsync(
|
|
handler,
|
|
state,
|
|
transferSubscriptions,
|
|
ct).ConfigureAwait(false);
|
|
restored.Add(subscription);
|
|
}
|
|
return restored;
|
|
}
|
|
}
|
|
}
|