mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-19 15:22:15 +08:00
9b034f8291
# Description Nullable reference types are now enabled once, in `common.props`, and every project in the repository builds warning-clean with them. **Configuration** - `<Nullable>enable</Nullable>` lives in `common.props`. All per-project `<Nullable>` settings are removed: 178 project files (enable, annotations, and the `disable` in the three Aot test projects). - 419 per-file `#nullable enable`/`restore` directives and the 4 `#nullable disable` directives are removed. - Kept on purpose: - The 5 `<auto-generated>` schema files (`UANodeSet.cs`, `UA Type Dictionary.cs`, `OPCBinarySchema.cs`, `SecuredApplication.cs`, `PInvokeHelper.cs`) keep `#nullable enable`. The compiler ignores the project setting in generated code, so the directive is required there. - `tests/Opc.Ua.Interop.LegacyPeer` keeps `disable`. It builds against the 1.5.378 packages and does not import the repository props. - `docs/DeveloperGuide.md` and `.github/copilot-instructions.md` now describe the central setting. **Migration** (the 43 unset and 13 annotations-only projects, roughly 10k diagnostics) - **Production code: annotated at the declarations.** Covers `tools/Opc.Ua.SourceGeneration.Core`, `src/Opc.Ua.Lds.Server` and the LDS sample. - Members, parameters and returns are nullable where null actually flows. - Null-check helpers carry `[NotNullWhen]` (`IsNull`, `IsValidXmlName`, `IsMethodTypeDesign`). - `CoreUtils.Format`, `Utils.Format`, `ITemplateWriter.WriteLine` take `params object?[]`. `Template.AddReplacement` takes `string?` (rendering already skips null replacements). - `IRegisteredServerStore.RegisterAsync` returns `Task<RegistrationEntry?>`: it returns null when a registration is removed. - Dereferences backed by an invariant (for example, the validated model) use `!`, so runtime behaviour is unchanged. - **Behavioural changes in production code** (small, deliberate): - `NodeSetToModelDesign` throws `InvalidOperationException` when the file is not a NodeSet. Before, it threw a NullReferenceException on the next line. - `ModelDesignValidator` starts its lookup tables empty instead of null. A redundant `if (m_nodes == null) return;` guard is gone. - **Test code: minimal annotations.** - `?` on values that can be null, `!` where the test asserts non-null. - `= null!` for fixture members assigned in SetUp. - `TryGetStructure<T>(out T? x)` where the inferred `T?` broke the `IEncodeable` constraint. - A few redundant `== null` checks on structs (`NodeId`, `ArrayOf<T>`) folded into the adjacent `IsNull`/`Count` checks. **Notes for reviewers** - The diff is large (~1,500 files) but almost entirely mechanical: `?`, `!` and directive removal. The non-annotation changes are listed above. - Known follow-up, not done here: `IModelDesign.Namespaces/TargetNamespace/NamespaceUris` stay non-nullable even though the validator returns null before it loads a dictionary. Making them nullable would ripple through every generator call site. ## Related Issues - Fixes #4439 ## 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. - [ ] I have added tests that prove my fix is effective or that my feature works and increased code coverage. - [x] I have added all necessary documentation. - [x] I have verified that my changes do not introduce (new) build or analyzer warnings. - [ ] I ran **all** tests locally using the **UA.slnx** solution against at least .net **framework** and .net **10**, and all passed. - [ ] I fixed **all** failing and flaky tests in the CI pipelines and **all** CodeQL warnings. - [ ] I have addressed **all** PR feedback received. The "no new warnings" box covers net10.0 and net48: full non-incremental builds of `UA.slnx`, `tools/SourceGeneration.slnx`, `tools/MigrationAnalyzer.slnx` and the Aot test projects finished with 0 warnings and 0 errors under the repository's warnings-as-errors settings. net9.0 and net8.0 also had no nullable diagnostics, but they were not rebuilt after the final fixes. Tests have not been run locally yet. 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
254 lines
9.3 KiB
C#
254 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;
|
|
using System.Collections.Generic;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
|
|
namespace Opc.Ua.Client.TestFramework
|
|
{
|
|
/// <summary>
|
|
/// In-process mock controller that lets a conformance test inject
|
|
/// service-result error codes or mutate response fields produced by
|
|
/// the in-process reference server. Implements
|
|
/// <see cref="IServiceResponseMutator"/> and is attached to the
|
|
/// server's <see cref="IServerBase.ResponseMutator"/> hook by the
|
|
/// <see cref="TestFixture"/>.
|
|
///
|
|
/// <para>
|
|
/// Tests register expectations with <see cref="ExpectNextResponse{TResponse}"/>
|
|
/// (matched once) or <see cref="WhenRequest{TRequest, TResponse}"/>
|
|
/// (matched on every request of the given type until reset). The
|
|
/// controller is reset between tests via <see cref="Reset"/>.
|
|
/// </para>
|
|
/// </summary>
|
|
public sealed class MockResponseController : IServiceResponseMutator
|
|
{
|
|
private readonly Lock m_lock = new();
|
|
private readonly List<Expectation> m_oneShot = [];
|
|
private readonly List<Expectation> m_recurring = [];
|
|
|
|
/// <summary>
|
|
/// Registers a one-shot expectation. The next response of type
|
|
/// <typeparamref name="TResponse"/> produced by the server is
|
|
/// passed to <paramref name="mutate"/> and the (possibly
|
|
/// modified) response is returned to the client. The expectation
|
|
/// is consumed after a single match.
|
|
/// </summary>
|
|
/// <typeparam name="TResponse">The response type to match.</typeparam>
|
|
/// <param name="mutate">The mutation to apply.</param>
|
|
/// <returns>A handle that, when disposed, removes the
|
|
/// expectation if it has not already fired.</returns>
|
|
/// <exception cref="ArgumentNullException"><paramref name="mutate"/> is <c>null</c>.</exception>
|
|
public IDisposable ExpectNextResponse<TResponse>(Action<TResponse> mutate)
|
|
where TResponse : class, IServiceResponse
|
|
{
|
|
if (mutate == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(mutate));
|
|
}
|
|
var entry = new Expectation
|
|
{
|
|
ResponseType = typeof(TResponse),
|
|
Mutator = (req, resp) => mutate((TResponse)resp)
|
|
};
|
|
lock (m_lock)
|
|
{
|
|
m_oneShot.Add(entry);
|
|
}
|
|
return new ExpectationHandle(this, entry, oneShot: true);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Registers a recurring expectation. Every request of type
|
|
/// <typeparamref name="TRequest"/> processed by the server
|
|
/// passes its <typeparamref name="TResponse"/> through
|
|
/// <paramref name="mutate"/> until the controller is
|
|
/// <see cref="Reset"/> or the returned handle is disposed.
|
|
/// </summary>
|
|
/// <typeparam name="TRequest">The request type to match.</typeparam>
|
|
/// <typeparam name="TResponse">The corresponding response
|
|
/// type (no compile-time pairing — the caller is responsible
|
|
/// for matching types).</typeparam>
|
|
/// <param name="mutate">The mutation, with the original request
|
|
/// available for inspection.</param>
|
|
/// <returns>A handle that, when disposed, removes the
|
|
/// expectation.</returns>
|
|
/// <exception cref="ArgumentNullException"><paramref name="mutate"/> is <c>null</c>.</exception>
|
|
public IDisposable WhenRequest<TRequest, TResponse>(
|
|
Action<TRequest, TResponse> mutate)
|
|
where TRequest : class, IServiceRequest
|
|
where TResponse : class, IServiceResponse
|
|
{
|
|
if (mutate == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(mutate));
|
|
}
|
|
var entry = new Expectation
|
|
{
|
|
RequestType = typeof(TRequest),
|
|
ResponseType = typeof(TResponse),
|
|
Mutator = (req, resp) => mutate((TRequest)req, (TResponse)resp)
|
|
};
|
|
lock (m_lock)
|
|
{
|
|
m_recurring.Add(entry);
|
|
}
|
|
return new ExpectationHandle(this, entry, oneShot: false);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Removes all registered expectations. Called by
|
|
/// <see cref="TestFixture"/> in [SetUp] so each test starts
|
|
/// from a clean state.
|
|
/// </summary>
|
|
public void Reset()
|
|
{
|
|
lock (m_lock)
|
|
{
|
|
m_oneShot.Clear();
|
|
m_recurring.Clear();
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Returns true if any expectations remain unfired. Useful for
|
|
/// per-test assertions on full coverage.
|
|
/// </summary>
|
|
public bool HasPendingOneShotExpectations
|
|
{
|
|
get
|
|
{
|
|
lock (m_lock)
|
|
{
|
|
return m_oneShot.Count > 0;
|
|
}
|
|
}
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public ValueTask<IServiceResponse> MutateResponseAsync(
|
|
IServiceRequest request,
|
|
IServiceResponse response,
|
|
CancellationToken cancellationToken = default)
|
|
{
|
|
Expectation? matched = null;
|
|
lock (m_lock)
|
|
{
|
|
// Prefer one-shot expectations (FIFO).
|
|
for (int i = 0; i < m_oneShot.Count; i++)
|
|
{
|
|
Expectation e = m_oneShot[i];
|
|
if (Matches(e, request, response))
|
|
{
|
|
matched = e;
|
|
m_oneShot.RemoveAt(i);
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (matched == null)
|
|
{
|
|
foreach (Expectation e in m_recurring)
|
|
{
|
|
if (Matches(e, request, response))
|
|
{
|
|
matched = e;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
matched?.Mutator(request, response);
|
|
|
|
return new ValueTask<IServiceResponse>(response);
|
|
}
|
|
|
|
private static bool Matches(Expectation e, IServiceRequest request, IServiceResponse response)
|
|
{
|
|
if (e.RequestType != null && !e.RequestType.IsInstanceOfType(request))
|
|
{
|
|
return false;
|
|
}
|
|
if (e.ResponseType != null && !e.ResponseType.IsInstanceOfType(response))
|
|
{
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
private void Remove(Expectation e, bool oneShot)
|
|
{
|
|
lock (m_lock)
|
|
{
|
|
if (oneShot)
|
|
{
|
|
m_oneShot.Remove(e);
|
|
}
|
|
else
|
|
{
|
|
m_recurring.Remove(e);
|
|
}
|
|
}
|
|
}
|
|
|
|
private sealed class Expectation
|
|
{
|
|
public Type RequestType { get; init; } = null!;
|
|
public Type ResponseType { get; init; } = null!;
|
|
public Action<IServiceRequest, IServiceResponse> Mutator { get; init; } = null!;
|
|
}
|
|
|
|
private sealed class ExpectationHandle : IDisposable
|
|
{
|
|
private readonly MockResponseController m_owner;
|
|
private readonly Expectation m_entry;
|
|
private readonly bool m_oneShot;
|
|
private int m_disposed;
|
|
|
|
public ExpectationHandle(MockResponseController owner, Expectation entry, bool oneShot)
|
|
{
|
|
m_owner = owner;
|
|
m_entry = entry;
|
|
m_oneShot = oneShot;
|
|
}
|
|
|
|
public void Dispose()
|
|
{
|
|
if (Interlocked.Exchange(ref m_disposed, 1) == 0)
|
|
{
|
|
m_owner.Remove(m_entry, m_oneShot);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|