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>
356 lines
15 KiB
C#
356 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.Collections.Generic;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using Moq;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Client.FileSystem;
|
|
using Opc.Ua.Client.TestFramework;
|
|
using Opc.Ua.Tests;
|
|
|
|
namespace Opc.Ua.Client.Tests.FileSystem
|
|
{
|
|
/// <summary>
|
|
/// Unit tests for <see cref="TemporaryFileTransferClient"/> that
|
|
/// validate the temp-write commit lifecycle (CloseAndCommit vs
|
|
/// Close, single terminal call).
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("FileSystem")]
|
|
[Parallelizable]
|
|
public class TemporaryFileTransferClientTests
|
|
{
|
|
[Test]
|
|
public async Task CommitAsyncSendsCloseAndCommitOnceAsync()
|
|
{
|
|
using var harness = TempTransferHarness.Create();
|
|
UaTemporaryWriteFile temp = await harness
|
|
.GenerateForWriteAsync().ConfigureAwait(false);
|
|
await harness.WriteSomeBytesAsync(temp).ConfigureAwait(false);
|
|
|
|
NodeId completion = await temp.CommitAsync().ConfigureAwait(false);
|
|
await temp.DisposeAsync().ConfigureAwait(false);
|
|
await temp.CommitAsync().ConfigureAwait(false);
|
|
|
|
Assert.That(harness.CloseAndCommitCount, Is.EqualTo(1));
|
|
Assert.That(harness.CloseCount, Is.Zero);
|
|
Assert.That(completion, Is.EqualTo(new NodeId(99)));
|
|
}
|
|
|
|
[Test]
|
|
public async Task DisposeWithoutCommitSendsCloseAsync()
|
|
{
|
|
using var harness = TempTransferHarness.Create();
|
|
UaTemporaryWriteFile temp = await harness
|
|
.GenerateForWriteAsync().ConfigureAwait(false);
|
|
|
|
await temp.DisposeAsync().ConfigureAwait(false);
|
|
await temp.DisposeAsync().ConfigureAwait(false);
|
|
|
|
Assert.That(harness.CloseCount, Is.EqualTo(1));
|
|
Assert.That(harness.CloseAndCommitCount, Is.Zero);
|
|
}
|
|
|
|
[Test]
|
|
public async Task GenerateForReadReturnsStreamThatClosesHandleOnDisposeAsync()
|
|
{
|
|
using var harness = TempTransferHarness.Create();
|
|
UaFileStream stream = await harness.Client
|
|
.GenerateFileForReadAsync(default, CancellationToken.None)
|
|
.ConfigureAwait(false);
|
|
|
|
await stream.DisposeAsync().ConfigureAwait(false);
|
|
|
|
Assert.That(harness.CloseCount, Is.EqualTo(1));
|
|
}
|
|
|
|
[Test]
|
|
public async Task GenerateForReadWaitsForReadTransferStateAsync()
|
|
{
|
|
using var harness = TempTransferHarness.Create();
|
|
harness.UseCompletionStateMachine(
|
|
ObjectIds.FileTransferStateMachineType_ReadPrepare,
|
|
ObjectIds.FileTransferStateMachineType_ReadPrepare,
|
|
ObjectIds.FileTransferStateMachineType_ReadTransfer);
|
|
|
|
UaFileStream stream = await harness.Client
|
|
.GenerateFileForReadAsync(default, CancellationToken.None)
|
|
.ConfigureAwait(false);
|
|
|
|
Assert.That(harness.StateReads, Is.EqualTo(3),
|
|
"Read must only be possible once the state reached ReadTransfer.");
|
|
await stream.DisposeAsync().ConfigureAwait(false);
|
|
}
|
|
|
|
[Test]
|
|
public async Task GenerateForReadKeepsWaitingWhileStateIsIdleAsync()
|
|
{
|
|
// Idle means generation has not started yet; only ReadTransfer
|
|
// makes Read possible (Part 20 4.4.3).
|
|
using var harness = TempTransferHarness.Create();
|
|
harness.UseCompletionStateMachine(
|
|
ObjectIds.FileTransferStateMachineType_Idle,
|
|
ObjectIds.FileTransferStateMachineType_ReadPrepare,
|
|
ObjectIds.FileTransferStateMachineType_ReadTransfer);
|
|
|
|
UaFileStream stream = await harness.Client
|
|
.GenerateFileForReadAsync(default, CancellationToken.None)
|
|
.ConfigureAwait(false);
|
|
|
|
Assert.That(harness.StateReads, Is.EqualTo(3));
|
|
await stream.DisposeAsync().ConfigureAwait(false);
|
|
}
|
|
|
|
[Test]
|
|
public void GenerateForReadThrowsAndClosesHandleWhenStateMachineFails()
|
|
{
|
|
using var harness = TempTransferHarness.Create();
|
|
harness.UseCompletionStateMachine(
|
|
ObjectIds.FileTransferStateMachineType_ReadPrepare,
|
|
ObjectIds.FileTransferStateMachineType_Error);
|
|
|
|
Assert.That(
|
|
async () => await harness.Client
|
|
.GenerateFileForReadAsync(default, CancellationToken.None)
|
|
.ConfigureAwait(false),
|
|
Throws.TypeOf<System.IO.IOException>());
|
|
Assert.That(harness.CloseCount, Is.EqualTo(1));
|
|
}
|
|
|
|
[Test]
|
|
public async Task TempStreamWrapperDisposeDoesNotCloseHandleAsync()
|
|
{
|
|
using var harness = TempTransferHarness.Create();
|
|
UaTemporaryWriteFile temp = await harness
|
|
.GenerateForWriteAsync().ConfigureAwait(false);
|
|
|
|
// Disposing the wrapped Stream must NOT close the server handle.
|
|
temp.Stream.Dispose();
|
|
Assert.That(harness.CloseCount, Is.Zero);
|
|
Assert.That(harness.CloseAndCommitCount, Is.Zero);
|
|
|
|
await temp.CommitAsync().ConfigureAwait(false);
|
|
Assert.That(harness.CloseAndCommitCount, Is.EqualTo(1));
|
|
}
|
|
|
|
private sealed class TempTransferHarness : IDisposable
|
|
{
|
|
private readonly Dictionary<uint, Func<CallMethodRequest, Variant[]>> m_handlers = [];
|
|
|
|
private TempTransferHarness(
|
|
TemporaryFileTransferClient client,
|
|
Mock<ISession> sessionMock)
|
|
{
|
|
Client = client;
|
|
SessionMock = sessionMock;
|
|
}
|
|
|
|
public TemporaryFileTransferClient Client { get; }
|
|
public Mock<ISession> SessionMock { get; }
|
|
public int StateReads { get; private set; }
|
|
|
|
/// <summary>
|
|
/// Makes GenerateFileForRead return a completion state machine
|
|
/// whose CurrentState/Id reads as <paramref name="states"/> in
|
|
/// turn (the last one repeats).
|
|
/// </summary>
|
|
public void UseCompletionStateMachine(params NodeId[] states)
|
|
{
|
|
var stateMachine = new NodeId(500);
|
|
var stateIdNode = new NodeId(501);
|
|
m_handlers[Methods.TemporaryFileTransferType_GenerateFileForRead] = _ =>
|
|
[
|
|
new Variant(new NodeId(123)),
|
|
new Variant(7u),
|
|
new Variant(stateMachine)
|
|
];
|
|
SessionMock
|
|
.Setup(s => s.TranslateBrowsePathsToNodeIdsAsync(
|
|
It.IsAny<RequestHeader>(),
|
|
It.IsAny<ArrayOf<BrowsePath>>(),
|
|
It.IsAny<CancellationToken>()))
|
|
.Returns<RequestHeader, ArrayOf<BrowsePath>, CancellationToken>(
|
|
(_, paths, _) =>
|
|
{
|
|
Assert.That(paths[0].StartingNode, Is.EqualTo(stateMachine));
|
|
return new ValueTask<TranslateBrowsePathsToNodeIdsResponse>(
|
|
new TranslateBrowsePathsToNodeIdsResponse
|
|
{
|
|
ResponseHeader = new ResponseHeader(),
|
|
Results = new[]
|
|
{
|
|
new BrowsePathResult
|
|
{
|
|
StatusCode = StatusCodes.Good,
|
|
Targets = new[]
|
|
{
|
|
new BrowsePathTarget
|
|
{
|
|
TargetId = stateIdNode,
|
|
RemainingPathIndex = uint.MaxValue
|
|
}
|
|
}.ToArrayOf()
|
|
}
|
|
}.ToArrayOf()
|
|
});
|
|
});
|
|
SessionMock
|
|
.Setup(s => s.ReadAsync(
|
|
It.IsAny<RequestHeader>(),
|
|
It.IsAny<double>(),
|
|
It.IsAny<TimestampsToReturn>(),
|
|
It.IsAny<ArrayOf<ReadValueId>>(),
|
|
It.IsAny<CancellationToken>()))
|
|
.Returns<RequestHeader, double, TimestampsToReturn, ArrayOf<ReadValueId>,
|
|
CancellationToken>(
|
|
(_, _, _, nodes, _) =>
|
|
{
|
|
Assert.That(nodes[0].NodeId, Is.EqualTo(stateIdNode));
|
|
NodeId state = states[Math.Min(StateReads, states.Length - 1)];
|
|
StateReads++;
|
|
return new ValueTask<ReadResponse>(new ReadResponse
|
|
{
|
|
ResponseHeader = new ResponseHeader(),
|
|
Results = new[] { new DataValue(new Variant(state)) }.ToArrayOf()
|
|
});
|
|
});
|
|
}
|
|
|
|
public int CloseAndCommitCount { get; private set; }
|
|
public int CloseCount { get; private set; }
|
|
|
|
public static TempTransferHarness Create()
|
|
{
|
|
ITelemetryContext telemetry = NUnitTelemetryContext.Create();
|
|
IServiceMessageContext messageContext = ServiceMessageContext.Create(telemetry);
|
|
var sessionMock = new Mock<ISession>(MockBehavior.Loose);
|
|
sessionMock.SetupGet(s => s.MessageContext).Returns(messageContext);
|
|
|
|
TempTransferHarness? harness = null;
|
|
sessionMock
|
|
.Setup(s => s.CallAsync(
|
|
It.IsAny<RequestHeader>(),
|
|
It.IsAny<ArrayOf<CallMethodRequest>>(),
|
|
It.IsAny<CancellationToken>()))
|
|
.Returns<RequestHeader, ArrayOf<CallMethodRequest>, CancellationToken>(
|
|
(_, requests, _) =>
|
|
{
|
|
CallMethodRequest req = requests[0];
|
|
req.MethodId.TryGetValue(out uint methodId);
|
|
Variant[] outputs = harness!.m_handlers[methodId](req);
|
|
var result = new CallMethodResult
|
|
{
|
|
StatusCode = StatusCodes.Good,
|
|
OutputArguments = outputs.ToArrayOf()
|
|
};
|
|
var response = new CallResponse
|
|
{
|
|
ResponseHeader = new ResponseHeader(),
|
|
Results = new[] { result }.ToArrayOf(),
|
|
DiagnosticInfos = default
|
|
};
|
|
return new ValueTask<CallResponse>(response);
|
|
});
|
|
|
|
var client = new TemporaryFileTransferClient(
|
|
sessionMock.Object,
|
|
new NodeId(1000));
|
|
|
|
harness = new TempTransferHarness(client, sessionMock);
|
|
harness.RegisterHandlers();
|
|
return harness;
|
|
}
|
|
|
|
public async Task<UaTemporaryWriteFile> GenerateForWriteAsync()
|
|
{
|
|
return await Client
|
|
.GenerateFileForWriteAsync(default, CancellationToken.None)
|
|
.ConfigureAwait(false);
|
|
}
|
|
|
|
public async Task WriteSomeBytesAsync(UaTemporaryWriteFile temp)
|
|
{
|
|
byte[] payload = [1, 2, 3];
|
|
#if NET
|
|
await temp.Stream
|
|
.WriteAsync(payload.AsMemory(), CancellationToken.None)
|
|
.ConfigureAwait(false);
|
|
#else
|
|
await temp.Stream
|
|
.WriteAsync(payload, 0, payload.Length, CancellationToken.None)
|
|
.ConfigureAwait(false);
|
|
#endif
|
|
}
|
|
|
|
public void Dispose()
|
|
{
|
|
// No-op (mock-only).
|
|
}
|
|
|
|
private void RegisterHandlers()
|
|
{
|
|
m_handlers[Methods.FileType_Close] = _ =>
|
|
{
|
|
CloseCount++;
|
|
return [];
|
|
};
|
|
m_handlers[Methods.FileType_Write] = _ => [];
|
|
m_handlers[Methods.FileType_SetPosition] = _ => [];
|
|
m_handlers[Methods.FileType_Read] = _ =>
|
|
[new Variant(Array.Empty<byte>().ToByteString())];
|
|
|
|
// GenerateFileForRead → (NodeId, uint handle, NodeId completionStateMachine).
|
|
m_handlers[Methods.TemporaryFileTransferType_GenerateFileForRead] = _ =>
|
|
[
|
|
new Variant(new NodeId(123)),
|
|
new Variant(7u),
|
|
new Variant(NodeId.Null)
|
|
];
|
|
|
|
// GenerateFileForWrite → (NodeId, uint handle).
|
|
m_handlers[Methods.TemporaryFileTransferType_GenerateFileForWrite] = _ =>
|
|
[
|
|
new Variant(new NodeId(123)),
|
|
new Variant(7u)
|
|
];
|
|
|
|
// CloseAndCommit → NodeId.
|
|
m_handlers[Methods.TemporaryFileTransferType_CloseAndCommit] = _ =>
|
|
{
|
|
CloseAndCommitCount++;
|
|
return [new Variant(new NodeId(99))];
|
|
};
|
|
}
|
|
}
|
|
}
|
|
}
|