mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-22 01:26:20 +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>
432 lines
16 KiB
C#
432 lines
16 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.Server.Fluent
|
|
{
|
|
/// <summary>
|
|
/// Extension methods that create new instance nodes via a user-supplied
|
|
/// factory delegate. Designed to integrate with the source generator's
|
|
/// emitted <c>CreateXxx</c> factory methods for AOT-safe instance
|
|
/// creation, while also accepting hand-rolled factories.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// <para>
|
|
/// Two flavours are exposed:
|
|
/// </para>
|
|
/// <list type="bullet">
|
|
/// <item><description>
|
|
/// <see cref="CreateInstance{TState}(INodeBuilder, QualifiedName, Func{NodeState, TState})"/>
|
|
/// — typed factory. Use when the caller already has a
|
|
/// concrete state class and an instance factory. Pair with
|
|
/// generated factories like
|
|
/// <c>context.CreatePumpType(parent, browseName)</c>.
|
|
/// </description></item>
|
|
/// <item><description>
|
|
/// <see cref="CreateInstance{TState}(INodeBuilder, QualifiedName, NodeId, Func{NodeState, TState})"/>
|
|
/// — same as above but also stamps an explicit
|
|
/// <c>TypeDefinitionId</c> on the new instance.
|
|
/// </description></item>
|
|
/// </list>
|
|
/// <para>
|
|
/// The new instance is attached to the parent via
|
|
/// <see cref="NodeState.AddChild(BaseInstanceState)"/>; if the
|
|
/// owning manager needs the instance indexed in
|
|
/// <c>PredefinedNodes</c> for direct NodeId lookup, the caller is
|
|
/// responsible for invoking
|
|
/// <c>AsyncCustomNodeManager.AddPredefinedNodeAsync</c> with the
|
|
/// returned <see cref="IInstanceBuilder{TState}.Node"/>.
|
|
/// </para>
|
|
/// <para>
|
|
/// NodeIds for the new instance follow the
|
|
/// <c>{parentIdentifier}_{browseName}</c> pattern used by the
|
|
/// generated NodeIdFactory and the existing
|
|
/// <see cref="ReferenceBuilderExtensions.AddObject(INodeBuilder, QualifiedName, NodeId)"/>
|
|
/// helper.
|
|
/// </para>
|
|
/// </remarks>
|
|
public static class InstanceCreationBuilderExtensions
|
|
{
|
|
/// <summary>
|
|
/// Creates a new instance of <typeparamref name="TState"/> under
|
|
/// the resolved parent.
|
|
/// </summary>
|
|
/// <typeparam name="TState">Concrete instance state class.</typeparam>
|
|
/// <param name="parent">The owning parent builder.</param>
|
|
/// <param name="browseName">Browse name of the new instance.</param>
|
|
/// <param name="factory">
|
|
/// Factory that constructs the state instance, typically a
|
|
/// generated method such as
|
|
/// <c>(p) => context.CreatePumpType(p, browseName)</c>.
|
|
/// </param>
|
|
/// <returns>A typed instance builder for further configuration.</returns>
|
|
public static IInstanceBuilder<TState> CreateInstance<TState>(
|
|
this INodeBuilder parent,
|
|
QualifiedName browseName,
|
|
Func<NodeState, TState> factory)
|
|
where TState : BaseInstanceState
|
|
{
|
|
return CreateInstance(parent, browseName, NodeId.Null, factory);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Creates a new instance of <typeparamref name="TState"/> under
|
|
/// the resolved parent and stamps an explicit
|
|
/// <c>TypeDefinitionId</c>.
|
|
/// </summary>
|
|
/// <typeparam name="TState">Concrete instance state class.</typeparam>
|
|
public static IInstanceBuilder<TState> CreateInstance<TState>(
|
|
this INodeBuilder parent,
|
|
QualifiedName browseName,
|
|
NodeId typeDefinitionId,
|
|
Func<NodeState, TState> factory)
|
|
where TState : BaseInstanceState
|
|
{
|
|
if (parent == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(parent));
|
|
}
|
|
if (browseName.IsNull)
|
|
{
|
|
throw new ArgumentNullException(nameof(browseName));
|
|
}
|
|
if (factory == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(factory));
|
|
}
|
|
string symbolicName = browseName.Name ?? string.Empty;
|
|
TState instance = factory(parent.Node) ?? throw ServiceResultException.Create(
|
|
StatusCodes.BadInvalidArgument,
|
|
"Factory returned null for instance '{0}'.",
|
|
browseName);
|
|
|
|
instance.SymbolicName = symbolicName;
|
|
instance.BrowseName = browseName;
|
|
instance.DisplayName = new LocalizedText(symbolicName);
|
|
|
|
string parentIdentifier = parent.Node.NodeId.IdentifierAsString;
|
|
instance.NodeId = new NodeId(
|
|
string.Concat(parentIdentifier, "_", symbolicName),
|
|
parent.Node.NodeId.NamespaceIndex);
|
|
|
|
if (!typeDefinitionId.IsNull)
|
|
|
|
{
|
|
|
|
instance.TypeDefinitionId = typeDefinitionId;
|
|
|
|
}
|
|
parent.Node.AddChild(instance);
|
|
|
|
return new InstanceBuilder<TState>(parent, instance);
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Typed fluent builder for an instance node created via
|
|
/// <see cref="InstanceCreationBuilderExtensions.CreateInstance{TState}(INodeBuilder, QualifiedName, Func{NodeState, TState})"/>.
|
|
/// </summary>
|
|
/// <typeparam name="TState">Concrete instance state class.</typeparam>
|
|
public interface IInstanceBuilder<TState>
|
|
where TState : BaseInstanceState
|
|
{
|
|
/// <summary>
|
|
/// The newly created instance.
|
|
/// </summary>
|
|
TState Node { get; }
|
|
|
|
/// <summary>
|
|
/// The owning parent builder.
|
|
/// </summary>
|
|
INodeBuilder Parent { get; }
|
|
|
|
/// <summary>
|
|
/// Returns a <see cref="INodeBuilder{TState}"/> view of the new
|
|
/// instance for further fluent wiring (e.g.
|
|
/// <c>WithProperty</c>, <c>Organizes</c>, <c>CreateLimitAlarm</c>).
|
|
/// </summary>
|
|
INodeBuilder<TState> AsNode();
|
|
|
|
/// <summary>
|
|
/// Invokes <paramref name="configure"/> with the typed
|
|
/// <see cref="INodeBuilder{TState}"/> view of the new instance.
|
|
/// Use for inline configuration:
|
|
/// <code>
|
|
/// parent.CreateInstance<PumpTypeState>("Pump #2", factory)
|
|
/// .Configure(b => b.WithProperty("Manufacturer", "..."));
|
|
/// </code>
|
|
/// </summary>
|
|
IInstanceBuilder<TState> Configure(Action<INodeBuilder<TState>> configure);
|
|
|
|
/// <summary>
|
|
/// Returns control to the parent builder for further chaining.
|
|
/// </summary>
|
|
INodeBuilder Done();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Internal implementation of <see cref="IInstanceBuilder{TState}"/>.
|
|
/// Reuses the same ad-hoc builder used by
|
|
/// <see cref="ReferenceBuilderExtensions.AddObject(INodeBuilder, QualifiedName, NodeId)"/>
|
|
/// so chained fluent calls work uniformly.
|
|
/// </summary>
|
|
/// <typeparam name="TState">Concrete instance state class.</typeparam>
|
|
internal sealed class InstanceBuilder<TState> : IInstanceBuilder<TState>
|
|
where TState : BaseInstanceState
|
|
{
|
|
public InstanceBuilder(INodeBuilder parent, TState node)
|
|
{
|
|
Parent = parent ?? throw new ArgumentNullException(nameof(parent));
|
|
Node = node ?? throw new ArgumentNullException(nameof(node));
|
|
}
|
|
|
|
public TState Node { get; }
|
|
public INodeBuilder Parent { get; }
|
|
|
|
public INodeBuilder<TState> AsNode()
|
|
{
|
|
return new AdHocInstanceNodeBuilder<TState>(Parent.Builder, Node);
|
|
}
|
|
|
|
public IInstanceBuilder<TState> Configure(Action<INodeBuilder<TState>> configure)
|
|
{
|
|
if (configure == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(configure));
|
|
}
|
|
configure(AsNode());
|
|
return this;
|
|
}
|
|
|
|
public INodeBuilder Done()
|
|
{
|
|
return Parent;
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Minimal typed node builder for instances that don't live in the
|
|
/// manager's <c>PredefinedNodes</c> dictionary. Mirrors the structure
|
|
/// of <c>ReferenceBuilderExtensions.AdHocNodeBuilder</c> but exposes
|
|
/// a strongly-typed <see cref="Node"/> property.
|
|
/// </summary>
|
|
/// <typeparam name="TState">Concrete node state class.</typeparam>
|
|
internal sealed class AdHocInstanceNodeBuilder<TState> : INodeBuilder<TState>
|
|
where TState : NodeState
|
|
{
|
|
internal AdHocInstanceNodeBuilder(INodeManagerBuilder owner, TState node)
|
|
{
|
|
Builder = owner ?? throw new ArgumentNullException(nameof(owner));
|
|
Node = node ?? throw new ArgumentNullException(nameof(node));
|
|
}
|
|
|
|
public TState Node { get; }
|
|
NodeState INodeBuilder.Node => Node;
|
|
NodeState INodeStateBuilder.Node => Node;
|
|
public INodeManagerBuilder Builder { get; }
|
|
|
|
INodeStateBuilder INodeStateBuilder.Child(QualifiedName browseName)
|
|
{
|
|
return Child(browseName);
|
|
}
|
|
|
|
INodeStateBuilder<TChild> INodeStateBuilder.Child<TChild>(QualifiedName browseName)
|
|
{
|
|
return Child<TChild>(browseName);
|
|
}
|
|
|
|
public INodeBuilder<TOther> As<TOther>() where TOther : NodeState
|
|
{
|
|
if (Node is not TOther typed)
|
|
{
|
|
throw ServiceResultException.Create(
|
|
StatusCodes.BadTypeMismatch,
|
|
"Node '{0}' is not assignable to '{1}'.",
|
|
Node.BrowseName,
|
|
typeof(TOther).Name);
|
|
}
|
|
return new AdHocInstanceNodeBuilder<TOther>(Builder, typed);
|
|
}
|
|
|
|
public INodeBuilder OnRead(NodeValueEventHandler handler)
|
|
{
|
|
return SetVariable(v => v.OnReadValue = handler);
|
|
}
|
|
|
|
public INodeBuilder OnRead(NodeValueSimpleEventHandler handler)
|
|
{
|
|
return SetVariable(v => v.OnSimpleReadValue = handler);
|
|
}
|
|
|
|
public INodeBuilder OnWrite(NodeValueEventHandler handler)
|
|
{
|
|
return SetVariable(v => v.OnWriteValue = handler);
|
|
}
|
|
|
|
public INodeBuilder OnWrite(NodeValueSimpleEventHandler handler)
|
|
{
|
|
return SetVariable(v => v.OnSimpleWriteValue = handler);
|
|
}
|
|
|
|
public INodeBuilder OnRead(NodeValueEventHandlerAsync handler)
|
|
{
|
|
return SetVariable(v => v.OnReadValueAsync = handler);
|
|
}
|
|
|
|
public INodeBuilder OnRead(NodeValueSimpleEventHandlerAsync handler)
|
|
{
|
|
return SetVariable(v => v.OnSimpleReadValueAsync = handler);
|
|
}
|
|
|
|
public INodeBuilder OnWrite(NodeValueWriteEventHandlerAsync handler)
|
|
{
|
|
return SetVariable(v => v.OnWriteValueAsync = handler);
|
|
}
|
|
|
|
public INodeBuilder OnWrite(NodeValueSimpleWriteEventHandlerAsync handler)
|
|
{
|
|
return SetVariable(v => v.OnSimpleWriteValueAsync = handler);
|
|
}
|
|
|
|
public INodeBuilder OnCall(GenericMethodCalledEventHandler2 handler)
|
|
{
|
|
return SetMethod(m => m.OnCallMethod2 = handler);
|
|
}
|
|
|
|
public INodeBuilder OnCall(GenericMethodCalledEventHandler2Async handler)
|
|
{
|
|
return SetMethod(m => m.OnCallMethod2Async = handler);
|
|
}
|
|
|
|
public INodeBuilder OnNodeAdded(NodeLifecycleHandler handler)
|
|
{
|
|
handler(Builder.Context, Node);
|
|
return this;
|
|
}
|
|
public INodeBuilder OnNodeRemoved(NodeLifecycleHandler handler)
|
|
{
|
|
return this;
|
|
}
|
|
public INodeBuilder OnHistoryRead(HistoryReadHandler handler)
|
|
{
|
|
return this;
|
|
}
|
|
public INodeBuilder OnHistoryUpdate(HistoryUpdateHandler handler)
|
|
{
|
|
return this;
|
|
}
|
|
public INodeBuilder OnConditionRefresh(ConditionRefreshHandler handler)
|
|
{
|
|
return this;
|
|
}
|
|
public INodeBuilder OnMonitoredItemCreated(MonitoredItemCreatedHandler handler)
|
|
{
|
|
return this;
|
|
}
|
|
|
|
public INodeBuilder OnEvent(EventNotificationHandler handler)
|
|
{
|
|
Node.OnReportEvent = (ctx, n, ev) => handler(ctx, n, ev);
|
|
return this;
|
|
}
|
|
|
|
public INodeBuilder AllowMultipleEventConsumers(bool enable = true)
|
|
{
|
|
if (Builder is NodeManagerBuilder nmb)
|
|
{
|
|
nmb.RegisterMultiConsumerNode(Node, enable);
|
|
}
|
|
return this;
|
|
}
|
|
|
|
public INodeBuilder Child(QualifiedName browseName)
|
|
{
|
|
NodeState? c = Node.FindChild(Builder.Context, browseName) ?? throw ServiceResultException.Create(
|
|
StatusCodes.BadNodeIdUnknown,
|
|
"Child '{0}' not found on '{1}'.",
|
|
browseName, Node.BrowseName);
|
|
return new AdHocInstanceNodeBuilder<NodeState>(Builder, c);
|
|
}
|
|
|
|
public INodeBuilder<TChild> Child<TChild>(QualifiedName browseName)
|
|
where TChild : NodeState
|
|
{
|
|
NodeState? c = Node.FindChild(Builder.Context, browseName);
|
|
if (c is not TChild typed)
|
|
{
|
|
throw ServiceResultException.Create(
|
|
StatusCodes.BadTypeMismatch,
|
|
"Child '{0}' on '{1}' is not '{2}'.",
|
|
browseName, Node.BrowseName, typeof(TChild).Name);
|
|
}
|
|
return new AdHocInstanceNodeBuilder<TChild>(Builder, typed);
|
|
}
|
|
|
|
public IVariableBuilder<TValue> Variable<TValue>(QualifiedName browseName)
|
|
{
|
|
NodeState? c = Node.FindChild(Builder.Context, browseName);
|
|
if (c is not BaseVariableState variable)
|
|
{
|
|
throw ServiceResultException.Create(
|
|
StatusCodes.BadTypeMismatch,
|
|
"Child '{0}' on '{1}' is not a variable.",
|
|
browseName, Node.BrowseName);
|
|
}
|
|
return new VariableBuilder<TValue>(Builder, variable);
|
|
}
|
|
|
|
private AdHocInstanceNodeBuilder<TState> SetVariable(Action<BaseVariableState> wire)
|
|
{
|
|
if (Node is not BaseVariableState v)
|
|
{
|
|
throw ServiceResultException.Create(
|
|
StatusCodes.BadInvalidArgument,
|
|
"Cannot wire variable callback on '{0}' (not a BaseVariableState).",
|
|
Node.BrowseName);
|
|
}
|
|
wire(v);
|
|
return this;
|
|
}
|
|
|
|
private AdHocInstanceNodeBuilder<TState> SetMethod(Action<MethodState> wire)
|
|
{
|
|
if (Node is not MethodState m)
|
|
{
|
|
throw ServiceResultException.Create(
|
|
StatusCodes.BadInvalidArgument,
|
|
"Cannot wire method callback on '{0}' (not a MethodState).",
|
|
Node.BrowseName);
|
|
}
|
|
wire(m);
|
|
return this;
|
|
}
|
|
}
|
|
}
|