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>
243 lines
9.3 KiB
C#
243 lines
9.3 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 turn a boolean supervision variable into
|
|
/// an alarm trigger. Modelled on the OPC UA DI / NAMUR NE 107
|
|
/// pattern: a <c>TwoStateDiscreteType</c> variable goes
|
|
/// <see langword="true"/> to indicate a supervision condition is
|
|
/// active and <see langword="false"/> to indicate it cleared.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// <para>
|
|
/// The fluent surface is intentionally narrow — observe the variable's
|
|
/// value transitions and dispatch typed callbacks (or activate /
|
|
/// deactivate an alarm created via the G2
|
|
/// <see cref="AlarmBuilderExtensions"/> helpers).
|
|
/// </para>
|
|
/// <para>
|
|
/// Detection is value-change based: the helper wraps the
|
|
/// variable's <c>OnStateChanged</c> hook and emits a transition
|
|
/// signal whenever the new boolean differs from the previous value.
|
|
/// No background polling thread is started — transitions only fire
|
|
/// when something else (an OnWrite handler, a simulation tick
|
|
/// handler, etc.) actually mutates the variable.
|
|
/// </para>
|
|
/// </remarks>
|
|
public static class SupervisionBuilderExtensions
|
|
{
|
|
/// <summary>
|
|
/// Returns a builder that fires the supplied
|
|
/// <paramref name="handler"/> whenever the variable's value
|
|
/// transitions from <see langword="false"/> to
|
|
/// <see langword="true"/>.
|
|
/// </summary>
|
|
public static IVariableBuilder<bool> OnRisingEdge(
|
|
this IVariableBuilder<bool> builder,
|
|
Action<ISystemContext> handler)
|
|
{
|
|
if (builder == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(builder));
|
|
}
|
|
if (handler == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(handler));
|
|
}
|
|
AttachEdgeTracker(builder.Node).RisingEdge += handler;
|
|
return builder;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Returns a builder that fires the supplied
|
|
/// <paramref name="handler"/> whenever the variable's value
|
|
/// transitions from <see langword="true"/> to
|
|
/// <see langword="false"/>.
|
|
/// </summary>
|
|
public static IVariableBuilder<bool> OnFallingEdge(
|
|
this IVariableBuilder<bool> builder,
|
|
Action<ISystemContext> handler)
|
|
{
|
|
if (builder == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(builder));
|
|
}
|
|
if (handler == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(handler));
|
|
}
|
|
AttachEdgeTracker(builder.Node).FallingEdge += handler;
|
|
return builder;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Wires a NAMUR-style supervision flag into an alarm:
|
|
/// the alarm's <see cref="ConditionState.EnabledState"/> /
|
|
/// <see cref="AlarmConditionState.ActiveState"/> are flipped
|
|
/// in lock-step with the variable's value transitions.
|
|
/// </summary>
|
|
/// <typeparam name="TAlarm">
|
|
/// Concrete alarm state type — must derive from
|
|
/// <see cref="AlarmConditionState"/> so the
|
|
/// <c>ActiveState</c> child is present.
|
|
/// </typeparam>
|
|
/// <param name="builder">The supervision variable builder.</param>
|
|
/// <param name="alarm">
|
|
/// An alarm previously created via the G2 builders
|
|
/// (<see cref="AlarmBuilderExtensions"/>) or hand-rolled.
|
|
/// </param>
|
|
public static IVariableBuilder<bool> ActivatesAlarm<TAlarm>(
|
|
this IVariableBuilder<bool> builder,
|
|
IAlarmBuilder<TAlarm> alarm)
|
|
where TAlarm : ConditionState
|
|
{
|
|
if (builder == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(builder));
|
|
}
|
|
if (alarm == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(alarm));
|
|
}
|
|
if (alarm.Alarm is not AlarmConditionState ac)
|
|
{
|
|
throw ServiceResultException.Create(
|
|
StatusCodes.BadTypeMismatch,
|
|
"ActivatesAlarm requires an AlarmConditionState; alarm '{0}' is '{1}'.",
|
|
alarm.Alarm.BrowseName,
|
|
alarm.Alarm.GetType().Name);
|
|
}
|
|
|
|
EdgeTracker tracker = AttachEdgeTracker(builder.Node);
|
|
tracker.RisingEdge += ctx => SetAlarmActive(ctx, ac, active: true);
|
|
tracker.FallingEdge += ctx => SetAlarmActive(ctx, ac, active: false);
|
|
return builder;
|
|
}
|
|
|
|
private static void SetAlarmActive(
|
|
ISystemContext context,
|
|
AlarmConditionState alarm,
|
|
bool active)
|
|
{
|
|
if (alarm.ActiveState?.Id != null)
|
|
{
|
|
alarm.ActiveState.Id.Value = active;
|
|
alarm.ActiveState.Value = new LocalizedText(active ? "Active" : "Inactive");
|
|
alarm.Time?.Value = DateTimeUtc.Now;
|
|
alarm.ClearChangeMasks(context, includeChildren: true);
|
|
}
|
|
}
|
|
|
|
private static EdgeTracker AttachEdgeTracker(BaseVariableState variable)
|
|
{
|
|
// Reuse an attached tracker so multiple OnRisingEdge /
|
|
// OnFallingEdge calls share a single OnAfterChange hook.
|
|
// The tracker is stashed on Handle so it survives across
|
|
// builder calls without us having to thread it through.
|
|
if (variable.Handle is EdgeTracker existing)
|
|
{
|
|
return existing;
|
|
}
|
|
var tracker = new EdgeTracker();
|
|
|
|
// Seed the tracker with the current value so the very next
|
|
// transition fires a proper edge event. Without this, a
|
|
// variable that starts at true and goes to false would not
|
|
// fire OnFallingEdge because the tracker would interpret the
|
|
// false as its baseline.
|
|
if (variable.WrappedValue.TryGetValue(out bool initial))
|
|
{
|
|
tracker.SeedInitial(initial);
|
|
}
|
|
|
|
NodeStateChangedHandler? previous = variable.OnStateChanged;
|
|
variable.OnStateChanged = (ctx, node, mask) =>
|
|
{
|
|
previous?.Invoke(ctx, node, mask);
|
|
if ((mask & NodeStateChangeMasks.Value) != 0 &&
|
|
node is BaseVariableState v)
|
|
{
|
|
bool current = v.WrappedValue.TryGetValue(out bool b) && b;
|
|
tracker.NotifyValue(ctx, current);
|
|
}
|
|
};
|
|
variable.Handle = tracker;
|
|
return tracker;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Per-variable edge dispatcher attached to the variable's
|
|
/// <c>Handle</c> property. Tracks the previous observed value
|
|
/// to emit only true edge transitions.
|
|
/// </summary>
|
|
private sealed class EdgeTracker
|
|
{
|
|
public event Action<ISystemContext>? RisingEdge;
|
|
public event Action<ISystemContext>? FallingEdge;
|
|
|
|
public void SeedInitial(bool value)
|
|
{
|
|
m_last = value;
|
|
m_initialized = true;
|
|
}
|
|
|
|
public void NotifyValue(ISystemContext context, bool current)
|
|
{
|
|
if (m_initialized && current == m_last)
|
|
{
|
|
return;
|
|
}
|
|
bool wasInitialized = m_initialized;
|
|
m_initialized = true;
|
|
bool previous = wasInitialized && m_last;
|
|
m_last = current;
|
|
|
|
if (current && !previous)
|
|
|
|
{
|
|
|
|
RisingEdge?.Invoke(context);
|
|
|
|
}
|
|
else if (!current && previous)
|
|
{
|
|
FallingEdge?.Invoke(context);
|
|
}
|
|
}
|
|
|
|
private bool m_last;
|
|
private bool m_initialized;
|
|
}
|
|
}
|
|
}
|