mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-19 07:02:16 +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>
241 lines
9.0 KiB
C#
241 lines
9.0 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.Collections.Generic;
|
|
using System.Runtime.CompilerServices;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
|
|
namespace Opc.Ua.Client.Subscriptions.Streaming
|
|
{
|
|
/// <summary>
|
|
/// Extensions on <see cref="IAsyncEnumerable{T}"/> useful for
|
|
/// short-lived subscriptions tracking state-machine transitions
|
|
/// or bounded observation windows.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// These helpers exist alongside (but do not replace) the
|
|
/// equivalents in <c>System.Linq.Async</c> because their semantics
|
|
/// are tuned for OPC UA subscribe-and-wait scenarios and differ
|
|
/// from the standard LINQ operators:
|
|
/// <list type="bullet">
|
|
/// <item><see cref="TakeUntilAsync{T}"/> is <em>inclusive</em> of
|
|
/// the matching item (yields it last), unlike
|
|
/// <c>System.Linq.Async.TakeWhile</c> which stops just before
|
|
/// the matching item.</item>
|
|
/// <item><see cref="WithTimeoutAsync{T}"/> completes the
|
|
/// enumeration <em>silently</em> on timeout instead of
|
|
/// throwing, so callers can use it as a bounded observation
|
|
/// window without needing a try/catch around the await foreach.</item>
|
|
/// <item><see cref="BufferedAsync{T}"/> yields fixed-size
|
|
/// chunks; the trailing partial chunk (if the source ends with
|
|
/// fewer items) is yielded too.</item>
|
|
/// </list>
|
|
/// Adding a dependency on <c>System.Linq.Async</c> just to swap
|
|
/// these out would force a single-implementation choice; keeping
|
|
/// these here lets the stack own the semantics callers depend on.
|
|
/// </remarks>
|
|
public static class StreamingSubscriptionExtensions
|
|
{
|
|
/// <summary>
|
|
/// Yields items until the predicate returns <c>true</c>. The
|
|
/// matching item is yielded last, then enumeration stops.
|
|
/// Useful for waiting on a specific state transition.
|
|
/// </summary>
|
|
/// <typeparam name="T">The type of items in the source sequence.</typeparam>
|
|
public static IAsyncEnumerable<T> TakeUntilAsync<T>(
|
|
this IAsyncEnumerable<T> source,
|
|
Func<T, bool> predicate,
|
|
CancellationToken ct = default)
|
|
{
|
|
if (source == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(source));
|
|
}
|
|
if (predicate == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(predicate));
|
|
}
|
|
return TakeUntilImpl(source, predicate, ct);
|
|
}
|
|
|
|
private static async IAsyncEnumerable<T> TakeUntilImpl<T>(
|
|
IAsyncEnumerable<T> source,
|
|
Func<T, bool> predicate,
|
|
[EnumeratorCancellation] CancellationToken ct)
|
|
{
|
|
await foreach (T item in source.ConfigureAwait(false))
|
|
{
|
|
ct.ThrowIfCancellationRequested();
|
|
yield return item;
|
|
if (predicate(item))
|
|
{
|
|
yield break;
|
|
}
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Yields items until the timeout elapses. The enumeration
|
|
/// completes silently when the timeout expires.
|
|
/// </summary>
|
|
/// <typeparam name="T">The type of items in the source sequence.</typeparam>
|
|
/// <param name="source">The source sequence.</param>
|
|
/// <param name="timeout">The timeout duration.</param>
|
|
/// <param name="timeProvider">
|
|
/// Optional <see cref="TimeProvider"/> used for the timeout
|
|
/// scheduler; defaults to <see cref="TimeProvider.System"/>.
|
|
/// </param>
|
|
/// <param name="ct">Cancellation token.</param>
|
|
public static IAsyncEnumerable<T> WithTimeoutAsync<T>(
|
|
this IAsyncEnumerable<T> source,
|
|
TimeSpan timeout,
|
|
TimeProvider? timeProvider = null,
|
|
CancellationToken ct = default)
|
|
{
|
|
if (source == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(source));
|
|
}
|
|
return WithTimeoutImpl(source, timeout, timeProvider ?? TimeProvider.System, ct);
|
|
}
|
|
|
|
private static async IAsyncEnumerable<T> WithTimeoutImpl<T>(
|
|
IAsyncEnumerable<T> source,
|
|
TimeSpan timeout,
|
|
TimeProvider timeProvider,
|
|
[EnumeratorCancellation] CancellationToken ct)
|
|
{
|
|
using CancellationTokenSource timeoutCts = timeProvider
|
|
.CreateCancellationTokenSource(timeout);
|
|
using var cts = CancellationTokenSource.CreateLinkedTokenSource(ct, timeoutCts.Token);
|
|
|
|
IAsyncEnumerator<T> enumerator =
|
|
source.GetAsyncEnumerator(cts.Token);
|
|
|
|
try
|
|
{
|
|
while (true)
|
|
{
|
|
bool hasNext;
|
|
try
|
|
{
|
|
hasNext = await enumerator.MoveNextAsync().ConfigureAwait(false);
|
|
}
|
|
catch (OperationCanceledException) when (cts.IsCancellationRequested && !ct.IsCancellationRequested)
|
|
{
|
|
yield break;
|
|
}
|
|
|
|
if (!hasNext)
|
|
{
|
|
yield break;
|
|
}
|
|
|
|
yield return enumerator.Current;
|
|
}
|
|
}
|
|
finally
|
|
{
|
|
await enumerator.DisposeAsync().ConfigureAwait(false);
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Yields exactly <paramref name="count"/> items then completes.
|
|
/// </summary>
|
|
/// <typeparam name="T">The type of items in the source sequence.</typeparam>
|
|
public static IAsyncEnumerable<T> TakeAsync<T>(
|
|
this IAsyncEnumerable<T> source,
|
|
int count,
|
|
CancellationToken ct = default)
|
|
{
|
|
if (source == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(source));
|
|
}
|
|
if (count <= 0)
|
|
{
|
|
throw new ArgumentOutOfRangeException(nameof(count));
|
|
}
|
|
return TakeImpl(source, count, ct);
|
|
}
|
|
|
|
private static async IAsyncEnumerable<T> TakeImpl<T>(
|
|
IAsyncEnumerable<T> source,
|
|
int count,
|
|
[EnumeratorCancellation] CancellationToken ct)
|
|
{
|
|
int taken = 0;
|
|
await foreach (T item in source.ConfigureAwait(false))
|
|
{
|
|
ct.ThrowIfCancellationRequested();
|
|
yield return item;
|
|
if (++taken >= count)
|
|
{
|
|
yield break;
|
|
}
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Buffers the first <paramref name="count"/> items into a
|
|
/// list and returns it.
|
|
/// </summary>
|
|
/// <typeparam name="T">The type of items in the source sequence.</typeparam>
|
|
public static async ValueTask<IReadOnlyList<T>> BufferedAsync<T>(
|
|
this IAsyncEnumerable<T> source,
|
|
int count,
|
|
CancellationToken ct = default)
|
|
{
|
|
if (source == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(source));
|
|
}
|
|
if (count <= 0)
|
|
{
|
|
throw new ArgumentOutOfRangeException(nameof(count));
|
|
}
|
|
|
|
var buffer = new List<T>(count);
|
|
await foreach (T item in source.ConfigureAwait(false))
|
|
{
|
|
ct.ThrowIfCancellationRequested();
|
|
buffer.Add(item);
|
|
if (buffer.Count >= count)
|
|
{
|
|
break;
|
|
}
|
|
}
|
|
return buffer;
|
|
}
|
|
}
|
|
}
|