Files
Marc Schier a81d981755 dotnet format sweep (whitespace, IDE, RCS) + code-style enforcer agent fix (#3865)
# 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>
2026-06-10 08:35:44 +02:00

336 lines
15 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.Threading;
using Microsoft.Extensions.Logging;
using Opc.Ua;
using Opc.Ua.Pumps;
using Opc.Ua.Server.Fluent;
namespace Pumps
{
/// <summary>
/// Sibling partial that wires per-node callbacks for the
/// <see cref="PumpNodeManager"/> using the fluent builder.
/// Demonstrates the OPC 40223 Pumps companion specification
/// with a full simulation loop.
/// </summary>
/// <remarks>
/// The node manager is hand-written and uses the fluent
/// <see cref="INodeManagerBuilder"/> API to wire per-node
/// callbacks. See <see cref="Configure"/> for the entry point.
/// </remarks>
public partial class PumpNodeManager
{
/// <summary>
/// ── Simulation state ────────────────────────────────────────
/// </summary>
private long m_simulationTicks;
private long m_numberOfStarts;
/// <summary>
/// Reference to the hand-rolled Pump #1 instance so the
/// simulation tick can mutate its DI properties in response to
/// supervision flags. Set by CreatePumpInstanceAsync.
/// </summary>
private Opc.Ua.Pumps.PumpState? m_pump1;
/// <summary>
/// Optional DI DeviceHealth variable supplied by a declarative
/// DeviceState device (e.g. Pump #2). Set via
/// RegisterSupervisedDeviceHealth and toggled by AdvanceSimulation
/// to reflect cavitation / motor-overheat states using the NAMUR
/// NE 107 enumeration.
/// </summary>
private BaseDataVariableState<Opc.Ua.Di.DeviceHealthEnumeration>?
m_supervisedDeviceHealth;
/// <summary>
/// ── Latest simulated values, updated by the simulation tick. ──
/// </summary>
private double m_currentPressure;
private double m_currentTemperature = 313.15;
private double m_currentBearingTemp = 333.15;
private double m_currentPower;
private double m_currentFlow;
private double m_currentEfficiency = 75.0;
private double m_currentLevel = 2.5;
private bool m_cavitation;
private bool m_motorOverheat;
partial void Configure(INodeManagerBuilder builder)
{
Server.Telemetry.CreateLogger<PumpNodeManager>()
.LogInformation("Configuring PumpNodeManager fluent wiring...");
WithIdentification(builder);
WithMeasurements(builder);
WithSupervision(builder);
// Single manager-owned simulation tick advances all live
// measurements at 250 ms intervals; lets time-based fault
// injection work cleanly.
builder.Simulation(TimeSpan.FromMilliseconds(250))
.OnTick((ctx, elapsed) => AdvanceSimulation());
}
/// <summary>
/// ── Identification properties via WithProperty ──────────────
/// PumpType.Identification is a mandatory child of PumpType so
/// it is materialised by the source-generated factory used in
/// CreatePumpInstanceAsync. BrowsePathResolver's cross-namespace
/// name-only fallback (FB-3 phase 1) resolves the unqualified
/// 'Identification' segment to the DI-namespace child without
/// requiring an explicit ns= prefix in the path.
/// </summary>
/// <param name="builder"></param>
private void WithIdentification(INodeManagerBuilder builder)
{
builder.Node("Pump #1/Identification")
.WithProperty("Manufacturer", "SimPump Corp")
.WithProperty("SerialNumber", "SN-001")
.WithProperty("ProductInstanceUri",
"urn:simdevice:SimPump:PumpX-2000:SN-001");
}
/// <summary>
/// ── Measurements with engineering units ─────────────────────
/// All seven analog measurements live under
/// PumpType.Operational.Measurements and are materialised by
/// CreatePumpInstanceAsync via the generator-emitted AddXxx
/// helpers. The cross-namespace name-only resolver fallback
/// means the unqualified browse path resolves through the
/// Pumps -> Machinery (Operational) -> Pumps (Measurements +
/// analog states) namespace transitions transparently.
/// </summary>
/// <param name="builder"></param>
private void WithMeasurements(INodeManagerBuilder builder)
{
AddMeasurement(builder,
"Pump #1/Operational/Measurements/DifferentialPressure",
() => m_currentPressure,
EngineeringUnits.Pascal, min: 0, max: 1_000_000);
AddMeasurement(builder,
"Pump #1/Operational/Measurements/FluidTemperature",
() => m_currentTemperature,
EngineeringUnits.Kelvin, min: 233.15, max: 473.15);
AddMeasurement(builder,
"Pump #1/Operational/Measurements/BearingTemperature",
() => m_currentBearingTemp,
EngineeringUnits.Kelvin, min: 233.15, max: 473.15);
AddMeasurement(builder,
"Pump #1/Operational/Measurements/PumpPowerInput",
() => m_currentPower,
EngineeringUnits.Watt, min: 0, max: 50_000);
AddMeasurement(builder,
"Pump #1/Operational/Measurements/MassFlow",
() => m_currentFlow,
EngineeringUnits.KilogramsPerSecond, min: 0, max: 1.0);
AddMeasurement(builder,
"Pump #1/Operational/Measurements/PumpEfficiency",
() => m_currentEfficiency,
EngineeringUnits.Percent, min: 0, max: 100);
AddMeasurement(builder,
"Pump #1/Operational/Measurements/Level",
() => m_currentLevel,
EngineeringUnits.Metre, min: 0, max: 10);
// Discrete count exposed alongside the analog measurements.
builder.Variable<uint>(
"Pump #1/Operational/Measurements/NumberOfStarts")
.OnRead(() => (uint)Interlocked.Read(ref m_numberOfStarts));
}
private static class EngineeringUnits
{
public static readonly EUInformation Pascal =
new("Pa", "Pascal", "http://www.opcfoundation.org/UA/units/un/cefact");
public static readonly EUInformation Kelvin =
new("K", "Kelvin", "http://www.opcfoundation.org/UA/units/un/cefact");
public static readonly EUInformation Watt =
new("W", "Watt", "http://www.opcfoundation.org/UA/units/un/cefact");
public static readonly EUInformation KilogramsPerSecond =
new("kg/s", "Kilograms per Second", "http://www.opcfoundation.org/UA/units/un/cefact");
public static readonly EUInformation Percent =
new("%", "Percent", "http://www.opcfoundation.org/UA/units/un/cefact");
public static readonly EUInformation Metre =
new("m", "Metre", "http://www.opcfoundation.org/UA/units/un/cefact");
}
/// <summary>
/// ── Supervision flags wired to NAMUR alarms ─────────────────
/// Demonstrates the FB-3 phase 3 typed accessor API: starting
/// from a typed INodeBuilder<PumpState> root, the generator-
/// emitted PumpStateComponents.Events extension walks to
/// SupervisionState (the type of PumpType.Events), and from
/// there the typed SupervisionStateComponents accessor walks
/// to SupervisionProcessFluid and SupervisionPumpOperation —
/// each step is compile-time checked against the model and
/// namespace-aware without forcing the author to spell out
/// browse-paths or QualifiedNames.
/// </summary>
/// <param name="builder"></param>
private void WithSupervision(INodeManagerBuilder builder)
{
ushort pumpsNs = (ushort)Server.NamespaceUris.GetIndex(
Opc.Ua.Pumps.Namespaces.Pumps);
Opc.Ua.Server.Fluent.INodeBuilder<Opc.Ua.Pumps.PumpState> pump =
builder.Node<Opc.Ua.Pumps.PumpState>("Pump #1");
IAlarmBuilder<NonExclusiveLimitAlarmState> tempAlarm = pump
.Components().Events()
.CreateLimitAlarm(new QualifiedName("OverTempAlarm", pumpsNs))
.WithLimits(highHigh: 373.15, high: 363.15, low: 283.15, lowLow: 273.15)
.OnAcknowledge((ctx, c, eventId, comment) => ServiceResult.Good);
pump.Components().Events()
.Components().SupervisionProcessFluid()
.Components().Cavitation()
.OnRead(() => m_cavitation)
.ActivatesAlarm(tempAlarm);
pump.Components().Events()
.Components().SupervisionPumpOperation()
.Components().MotorOverheat()
.OnRead(() => m_motorOverheat);
}
/// <summary>
/// Direct measurement wiring — failures now propagate as
/// BadNodeIdUnknown ServiceResultException so wiring errors
/// surface at configuration time rather than getting silently
/// logged. The legacy TryAdd* helpers and their per-method
/// try/catch blocks were necessary while the optional pump
/// subtree was unmaterialised; CreatePumpInstanceAsync now
/// materialises every wired leaf so the wiring is unconditional.
/// </summary>
/// <param name="builder"></param>
/// <param name="browsePath"></param>
/// <param name="getter"></param>
/// <param name="units"></param>
/// <param name="min"></param>
/// <param name="max"></param>
private static void AddMeasurement(
INodeManagerBuilder builder,
string browsePath,
Func<double> getter,
EUInformation units,
double min,
double max)
{
builder.Variable<double>(browsePath)
.OnRead(getter)
.WithEngineeringUnits(units)
.WithEURange(min, max);
}
/// <summary>
/// ── Simulation tick — advances all live measurements ────────
/// </summary>
private void AdvanceSimulation()
{
long t = Interlocked.Increment(ref m_simulationTicks);
m_currentPressure = 200000.0 + (50000.0 * Math.Sin(t * 0.03));
m_currentTemperature = 313.15 + (5.0 * Math.Sin(t * 0.01));
m_currentBearingTemp = 333.15 + (8.0 * Math.Cos(t * 0.008));
m_currentPower = 5000.0 + (500.0 * Math.Sin(t * 0.02));
m_currentFlow = 0.05 + (0.005 * Math.Cos(t * 0.04));
m_currentEfficiency = 75.0 + (10.0 * Math.Sin(t * 0.015));
m_currentLevel = 2.5 + (0.5 * Math.Sin(t * 0.02));
// Fault injection — supervision flags transition true/false.
m_cavitation = (t % 120) > 100;
m_motorOverheat = (t % 200) > 190;
// Map the simulated supervision flags onto the DI DeviceHealth
// NAMUR NE 107 enumeration. Motor overheat is the more severe
// condition so it wins when both are active. The variable is
// ClearChangeMasks-ed so subscriptions see each transition.
UpdateDeviceHealth();
// Periodic restart simulation — every 3600 ticks (~15 min at 250ms).
if (t % 3600 == 0)
{
Interlocked.Increment(ref m_numberOfStarts);
}
}
/// <summary>
/// Maps the simulated supervision flags onto the DI
/// <see cref="Opc.Ua.Di.DeviceHealthEnumeration"/>
/// using the NAMUR NE 107 severity order: a motor overheat
/// always wins over a cavitation event (FAILURE &gt;
/// MAINTENANCE_REQUIRED); when neither flag is set the device
/// reports NORMAL. Exposed as a pure function so tests can
/// exercise the mapping without instantiating the manager.
/// </summary>
public static Opc.Ua.Di.DeviceHealthEnumeration
MapSupervisionToDeviceHealth(bool cavitation, bool motorOverheat)
{
if (motorOverheat)
{
return Opc.Ua.Di.DeviceHealthEnumeration.FAILURE;
}
if (cavitation)
{
return Opc.Ua.Di.DeviceHealthEnumeration.MAINTENANCE_REQUIRED;
}
return Opc.Ua.Di.DeviceHealthEnumeration.NORMAL;
}
private void UpdateDeviceHealth()
{
BaseDataVariableState<Opc.Ua.Di.DeviceHealthEnumeration>?
health = m_supervisedDeviceHealth;
if (health == null)
{
return;
}
Opc.Ua.Di.DeviceHealthEnumeration desired =
MapSupervisionToDeviceHealth(m_cavitation, m_motorOverheat);
if (health.Value != desired)
{
health.Value = desired;
health.Timestamp = DateTime.UtcNow;
health.ClearChangeMasks(SystemContext, includeChildren: false);
}
}
}
}