mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-21 00:56:28 +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>
230 lines
9.2 KiB
C#
230 lines
9.2 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.Globalization;
|
|
using System.Threading;
|
|
|
|
namespace Opc.Ua.Server.NodeManager
|
|
{
|
|
/// <summary>
|
|
/// Helpers for the <c>NodeVersion</c> property defined in OPC UA
|
|
/// Part 5 §9.32.2. The spec requires that only nodes carrying a
|
|
/// <c>NodeVersion</c> property may trigger a <c>ModelChangeEvent</c>,
|
|
/// that every emission bumps the property, and that any write to
|
|
/// the property fires a model-change event.
|
|
/// </summary>
|
|
public static class NodeStateModelChangeExtensions
|
|
{
|
|
/// <summary>
|
|
/// AsyncLocal guard set by <see cref="BumpNodeVersion"/> so that
|
|
/// the <c>OnWriteValue</c> handler installed by
|
|
/// <see cref="EnableModelChangeTracking"/> does not re-enter and
|
|
/// double-fire a model-change event for framework-driven bumps.
|
|
/// </summary>
|
|
private static readonly AsyncLocal<bool> s_isFrameworkBump = new();
|
|
|
|
/// <summary>
|
|
/// True when execution is inside a framework-driven NodeVersion
|
|
/// bump (the framework already emitted the appropriate
|
|
/// <c>GeneralModelChangeEvent</c> and the OnWriteValue hook must
|
|
/// not echo it as a <c>BaseModelChangeEvent</c>).
|
|
/// </summary>
|
|
public static bool IsInsideFrameworkNodeVersionBump => s_isFrameworkBump.Value;
|
|
|
|
/// <summary>
|
|
/// Returns <c>true</c> when <paramref name="node"/> has a child
|
|
/// property with <c>BrowseName == BrowseNames.NodeVersion</c>.
|
|
/// </summary>
|
|
public static bool HasNodeVersion(this NodeState node)
|
|
{
|
|
return GetNodeVersionProperty(node) != null;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Returns the <c>NodeVersion</c> property of
|
|
/// <paramref name="node"/> if present, otherwise <c>null</c>.
|
|
/// </summary>
|
|
public static PropertyState<string>? GetNodeVersionProperty(this NodeState node)
|
|
{
|
|
if (node == null)
|
|
{
|
|
return null;
|
|
}
|
|
BaseInstanceState? child = node.FindChild(null!, new QualifiedName(BrowseNames.NodeVersion));
|
|
return child as PropertyState<string>;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Increments the <c>NodeVersion</c> of <paramref name="node"/>.
|
|
/// Parses the current value as <see cref="ulong"/> (treating
|
|
/// missing / non-numeric as 0), increments, and writes back as
|
|
/// the decimal string. No-op when the node has no
|
|
/// <c>NodeVersion</c> property.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// The framework calls this from
|
|
/// <c>AsyncCustomNodeManager.EmitModelChange</c> after recording
|
|
/// a change for the node. The internal AsyncLocal flag
|
|
/// <see cref="IsInsideFrameworkNodeVersionBump"/> is set while
|
|
/// the underlying write executes so the OnWriteValue hook
|
|
/// installed by <see cref="EnableModelChangeTracking"/> does not
|
|
/// echo the change as a <c>BaseModelChangeEvent</c>.
|
|
/// </remarks>
|
|
public static void BumpNodeVersion(this NodeState node, ISystemContext context)
|
|
{
|
|
if (node == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(node));
|
|
}
|
|
|
|
PropertyState<string>? nodeVersion = GetNodeVersionProperty(node);
|
|
if (nodeVersion == null)
|
|
{
|
|
return;
|
|
}
|
|
|
|
ulong current = 0;
|
|
if (!string.IsNullOrEmpty(nodeVersion.Value)
|
|
&& !ulong.TryParse(nodeVersion.Value, NumberStyles.Integer, CultureInfo.InvariantCulture, out current))
|
|
{
|
|
current = 0;
|
|
}
|
|
|
|
unchecked
|
|
{
|
|
current++;
|
|
if (current == 0)
|
|
{
|
|
current = 1;
|
|
}
|
|
}
|
|
|
|
bool previous = s_isFrameworkBump.Value;
|
|
s_isFrameworkBump.Value = true;
|
|
try
|
|
{
|
|
nodeVersion.Value = current.ToString(CultureInfo.InvariantCulture);
|
|
nodeVersion.Timestamp = DateTime.UtcNow;
|
|
nodeVersion.StatusCode = StatusCodes.Good;
|
|
nodeVersion.ClearChangeMasks(context, false);
|
|
}
|
|
finally
|
|
{
|
|
s_isFrameworkBump.Value = previous;
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Marks <paramref name="node"/> as eligible to trigger
|
|
/// <c>ModelChangeEvents</c> by attaching a <c>NodeVersion</c>
|
|
/// property in namespace <paramref name="namespaceIndex"/> if
|
|
/// none is present, and wiring an <c>OnWriteValue</c> handler
|
|
/// that posts a <c>BaseModelChangeEvent</c> through
|
|
/// <paramref name="raiseBaseModelChangeEvent"/> whenever the
|
|
/// property is written by an external client. Framework-driven
|
|
/// bumps (see <see cref="BumpNodeVersion"/>) are suppressed via
|
|
/// an AsyncLocal guard so they do not echo.
|
|
/// </summary>
|
|
/// <param name="node">The node to enable tracking on.</param>
|
|
/// <param name="namespaceIndex">
|
|
/// Namespace index for the new NodeVersion property when one is
|
|
/// attached.
|
|
/// </param>
|
|
/// <param name="raiseBaseModelChangeEvent">
|
|
/// Callback invoked when an external client writes the
|
|
/// NodeVersion. Typically wired to
|
|
/// <c>AsyncCustomNodeManager.RaiseBaseModelChangeEvent</c>.
|
|
/// </param>
|
|
/// <returns>
|
|
/// The existing or newly attached NodeVersion property. Always
|
|
/// non-null.
|
|
/// </returns>
|
|
public static PropertyState<string> EnableModelChangeTracking(
|
|
this NodeState node,
|
|
ushort namespaceIndex,
|
|
Action<ISystemContext, NodeState>? raiseBaseModelChangeEvent = null)
|
|
{
|
|
if (node == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(node));
|
|
}
|
|
|
|
PropertyState<string>? nodeVersion = GetNodeVersionProperty(node);
|
|
if (nodeVersion == null)
|
|
{
|
|
nodeVersion = new PropertyState<string>.Implementation<VariantBuilder>(node)
|
|
{
|
|
SymbolicName = BrowseNames.NodeVersion,
|
|
BrowseName = new QualifiedName(BrowseNames.NodeVersion, 0),
|
|
DisplayName = new LocalizedText(BrowseNames.NodeVersion),
|
|
DataType = DataTypeIds.String,
|
|
ValueRank = ValueRanks.Scalar,
|
|
AccessLevel = AccessLevels.CurrentReadOrWrite,
|
|
UserAccessLevel = AccessLevels.CurrentReadOrWrite,
|
|
Value = "1",
|
|
ReferenceTypeId = ReferenceTypeIds.HasProperty,
|
|
TypeDefinitionId = VariableTypeIds.PropertyType,
|
|
NodeId = new NodeId(Guid.NewGuid(), namespaceIndex)
|
|
};
|
|
node.AddChild(nodeVersion);
|
|
}
|
|
|
|
if (raiseBaseModelChangeEvent != null)
|
|
{
|
|
NodeState owner = node;
|
|
nodeVersion.OnWriteValue = (
|
|
ctx,
|
|
target,
|
|
indexRange,
|
|
dataEncoding,
|
|
ref value,
|
|
ref statusCode,
|
|
ref timestamp) =>
|
|
{
|
|
if (target is PropertyState<string> property
|
|
&& value.TryGetValue(out string? newValue))
|
|
{
|
|
property.Value = newValue;
|
|
}
|
|
|
|
if (!IsInsideFrameworkNodeVersionBump)
|
|
{
|
|
raiseBaseModelChangeEvent(ctx, owner);
|
|
}
|
|
|
|
return ServiceResult.Good;
|
|
};
|
|
}
|
|
|
|
return nodeVersion;
|
|
}
|
|
}
|
|
}
|