mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-29 07:07:24 +08:00
# 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>
241 lines
9.8 KiB
C#
241 lines
9.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;
|
|
|
|
namespace Opc.Ua.Client.Subscriptions.MonitoredItems
|
|
{
|
|
/// <summary>
|
|
/// Immutable snapshot of a V2 <see cref="IMonitoredItem"/>'s
|
|
/// configuration plus the server-side identifiers needed to take
|
|
/// over the item on a transferred subscription.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// <para>
|
|
/// Produced by <see cref="MonitoredItem.Snapshot"/> and consumed by
|
|
/// <see cref="ISubscriptionManager.LoadAsync"/>.
|
|
/// Per-item runtime values (filter result, last sample,
|
|
/// current sampling interval) are intentionally not captured — the
|
|
/// transfer path re-binds them from the server via
|
|
/// <c>GetMonitoredItems</c>, and the recreate path mints fresh ones.
|
|
/// </para>
|
|
/// <para>
|
|
/// The snapshot is itself an <see cref="IEncodeable"/> via the
|
|
/// <see cref="DataTypeAttribute"/> source generator. The fields
|
|
/// carried on the wire are simple primitives (e.g. <see cref="int"/>
|
|
/// milliseconds for durations, <see cref="uint"/> for enums); the
|
|
/// non-encoded <see cref="ToOptions"/> projection exposes a
|
|
/// consumer-friendly <see cref="MonitoredItemOptions"/> built from
|
|
/// those surrogate fields. The companion <see cref="AsOptions"/>
|
|
/// factory does the inverse mapping at <see cref="MonitoredItem.Snapshot"/>
|
|
/// time.
|
|
/// </para>
|
|
/// </remarks>
|
|
[DataType(Namespace = Namespaces.OpcUaXsd)]
|
|
public sealed partial record class MonitoredItemStateSnapshot
|
|
{
|
|
/// <summary>
|
|
/// Stable, manager-unique name (the lookup key used by
|
|
/// <see cref="IMonitoredItemCollection.TryGetMonitoredItemByName"/>
|
|
/// and by <see cref="IMonitoredItemCollection.TryAdd"/>).
|
|
/// </summary>
|
|
[DataTypeField(Order = 1)]
|
|
public partial string Name { get; init; }
|
|
|
|
/// <summary>
|
|
/// Client-assigned handle at snapshot time. Used by the
|
|
/// transfer leg of restore to re-bind to the server-side
|
|
/// monitored item via the saved <see cref="ServerId"/>;
|
|
/// ignored by the recreate leg (the V2 state machine mints a
|
|
/// fresh client handle).
|
|
/// </summary>
|
|
[DataTypeField(Order = 2)]
|
|
public partial uint ClientHandle { get; init; }
|
|
|
|
/// <summary>
|
|
/// Server-assigned monitored item id, or <c>0</c> if the item
|
|
/// had not been created on the server yet. Used by the
|
|
/// transfer leg to match this item via the
|
|
/// <c>GetMonitoredItems</c> server-handle table.
|
|
/// </summary>
|
|
[DataTypeField(Order = 3)]
|
|
public partial uint ServerId { get; init; }
|
|
|
|
/// <summary>
|
|
/// Client handle of the monitored item that triggers this item,
|
|
/// or <c>0</c> if not triggered.
|
|
/// </summary>
|
|
[DataTypeField(Order = 4)]
|
|
public partial uint TriggeringItemClientHandle { get; init; }
|
|
|
|
/// <summary>
|
|
/// <see cref="MonitoredItemOptions.Order"/> surrogate.
|
|
/// </summary>
|
|
[DataTypeField(Order = 10)]
|
|
public partial uint Order { get; init; }
|
|
|
|
/// <summary>
|
|
/// <see cref="MonitoredItemOptions.StartNodeId"/> surrogate.
|
|
/// Null sentinel: <see cref="NodeId.Null"/>.
|
|
/// </summary>
|
|
[DataTypeField(Order = 11)]
|
|
public partial NodeId StartNodeId { get; init; }
|
|
|
|
/// <summary>
|
|
/// <see cref="MonitoredItemOptions.TimestampsToReturn"/> surrogate.
|
|
/// </summary>
|
|
[DataTypeField(Order = 12)]
|
|
public partial uint TimestampsToReturn { get; init; }
|
|
|
|
/// <summary>
|
|
/// <see cref="MonitoredItemOptions.AttributeId"/> surrogate.
|
|
/// </summary>
|
|
[DataTypeField(Order = 13)]
|
|
public partial uint AttributeId { get; init; }
|
|
|
|
/// <summary>
|
|
/// <see cref="MonitoredItemOptions.IndexRange"/> surrogate.
|
|
/// </summary>
|
|
[DataTypeField(Order = 14)]
|
|
public partial string IndexRange { get; init; }
|
|
|
|
/// <summary>
|
|
/// <see cref="MonitoredItemOptions.Encoding"/> surrogate. Null
|
|
/// sentinel: <see cref="QualifiedName.Null"/>.
|
|
/// </summary>
|
|
[DataTypeField(Order = 15)]
|
|
public partial QualifiedName Encoding { get; init; }
|
|
|
|
/// <summary>
|
|
/// <see cref="MonitoredItemOptions.MonitoringMode"/> surrogate.
|
|
/// </summary>
|
|
[DataTypeField(Order = 16)]
|
|
public partial uint MonitoringMode { get; init; }
|
|
|
|
/// <summary>
|
|
/// <see cref="MonitoredItemOptions.SamplingInterval"/> as whole
|
|
/// milliseconds.
|
|
/// </summary>
|
|
[DataTypeField(Order = 17)]
|
|
public partial int SamplingIntervalMs { get; init; }
|
|
|
|
/// <summary>
|
|
/// <see cref="MonitoredItemOptions.Filter"/> surrogate.
|
|
/// Polymorphic; encoded via <see cref="ExtensionObject"/> so the
|
|
/// concrete <see cref="DataChangeFilter"/> /
|
|
/// <see cref="EventFilter"/> / <see cref="AggregateFilter"/>
|
|
/// type round-trips.
|
|
/// </summary>
|
|
[DataTypeField(Order = 18, StructureHandling = StructureHandling.ExtensionObject)]
|
|
public partial MonitoringFilter? Filter { get; init; }
|
|
|
|
/// <summary>
|
|
/// <see cref="MonitoredItemOptions.QueueSize"/> surrogate.
|
|
/// </summary>
|
|
[DataTypeField(Order = 19)]
|
|
public partial uint QueueSize { get; init; }
|
|
|
|
/// <summary>
|
|
/// <see cref="MonitoredItemOptions.DiscardOldest"/> surrogate.
|
|
/// </summary>
|
|
[DataTypeField(Order = 20)]
|
|
public partial bool DiscardOldest { get; init; }
|
|
|
|
/// <summary>
|
|
/// <see cref="MonitoredItemOptions.AutoSetQueueSize"/> surrogate.
|
|
/// </summary>
|
|
[DataTypeField(Order = 21)]
|
|
public partial bool AutoSetQueueSize { get; init; }
|
|
|
|
/// <summary>
|
|
/// Project the encoded surrogate fields back into a live
|
|
/// <see cref="MonitoredItemOptions"/>. Not serialized.
|
|
/// </summary>
|
|
public MonitoredItemOptions ToOptions()
|
|
{
|
|
return new MonitoredItemOptions
|
|
{
|
|
Order = Order,
|
|
StartNodeId = StartNodeId.IsNull ? NodeId.Null : StartNodeId,
|
|
TimestampsToReturn = (TimestampsToReturn)TimestampsToReturn,
|
|
AttributeId = AttributeId,
|
|
IndexRange = IndexRange,
|
|
Encoding = Encoding.IsNull ? null : Encoding,
|
|
MonitoringMode = (MonitoringMode)MonitoringMode,
|
|
SamplingInterval = TimeSpan.FromMilliseconds(SamplingIntervalMs),
|
|
Filter = Filter,
|
|
QueueSize = QueueSize,
|
|
DiscardOldest = DiscardOldest,
|
|
AutoSetQueueSize = AutoSetQueueSize
|
|
};
|
|
}
|
|
|
|
/// <summary>
|
|
/// Construct a <see cref="MonitoredItemStateSnapshot"/> from a
|
|
/// live <see cref="MonitoredItemOptions"/> + the captured
|
|
/// server-side state.
|
|
/// </summary>
|
|
public static MonitoredItemStateSnapshot AsOptions(
|
|
string name,
|
|
MonitoredItemOptions options,
|
|
uint clientHandle,
|
|
uint serverId,
|
|
uint triggeringItemClientHandle)
|
|
{
|
|
if (options == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(options));
|
|
}
|
|
return new MonitoredItemStateSnapshot
|
|
{
|
|
Name = name ?? string.Empty,
|
|
ClientHandle = clientHandle,
|
|
ServerId = serverId,
|
|
TriggeringItemClientHandle = triggeringItemClientHandle,
|
|
Order = options.Order,
|
|
StartNodeId = options.StartNodeId.IsNull ? NodeId.Null : options.StartNodeId,
|
|
TimestampsToReturn = (uint)options.TimestampsToReturn,
|
|
AttributeId = options.AttributeId,
|
|
IndexRange = options.IndexRange ?? string.Empty,
|
|
Encoding = options.Encoding.HasValue && !options.Encoding.Value.IsNull
|
|
? options.Encoding.Value
|
|
: QualifiedName.Null,
|
|
MonitoringMode = (uint)options.MonitoringMode,
|
|
SamplingIntervalMs = (int)Math.Min(
|
|
int.MaxValue,
|
|
Math.Max(0, options.SamplingInterval.TotalMilliseconds)),
|
|
Filter = options.Filter,
|
|
QueueSize = options.QueueSize,
|
|
DiscardOldest = options.DiscardOldest,
|
|
AutoSetQueueSize = options.AutoSetQueueSize
|
|
};
|
|
}
|
|
}
|
|
}
|