mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-24 02:58:36 +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>
161 lines
7.0 KiB
C#
161 lines
7.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/
|
|
* ======================================================================*/
|
|
|
|
// CA2007: tests run without a SynchronizationContext; ConfigureAwait(false)
|
|
// adds noise without a behavioural benefit. Disabled file-level for the suite.
|
|
#pragma warning disable CA2007
|
|
|
|
using System.Collections.Generic;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using Microsoft.Extensions.Time.Testing;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Server.Historian;
|
|
using Opc.Ua.Server.Historian.InMemory;
|
|
|
|
namespace Opc.Ua.Server.Tests.Historian
|
|
{
|
|
/// <summary>
|
|
/// Verifies atomic in-memory historian insertion and rollback of failed batches.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("Historian")]
|
|
[Parallelizable(ParallelScope.All)]
|
|
public class InMemoryTransactionalProviderTests
|
|
{
|
|
/// <summary>
|
|
/// Verifies that atomic insertion commits when every value is new.
|
|
/// </summary>
|
|
[Test]
|
|
public async Task InsertAtomicCommitsWhenAllValuesNewAsync()
|
|
{
|
|
using var provider = new InMemoryHistorianProvider(
|
|
new InMemoryHistorianOptions(),
|
|
new FakeTimeProvider(BaseTime));
|
|
var nodeId = new NodeId("tx.var", 1);
|
|
provider.Register(nodeId);
|
|
|
|
HistorianOperationContext context = CreateContext();
|
|
var values = new List<DataValue>
|
|
{
|
|
MakeValue(BaseTime.AddSeconds(1), 1.0),
|
|
MakeValue(BaseTime.AddSeconds(2), 2.0),
|
|
MakeValue(BaseTime.AddSeconds(3), 3.0)
|
|
};
|
|
|
|
HistorianUpdateOutcome<DataValue> outcome = await provider.InsertAtomicAsync(
|
|
context, nodeId, values, CancellationToken.None).ConfigureAwait(false);
|
|
|
|
Assert.That(outcome.OperationResults, Has.Count.EqualTo(3));
|
|
Assert.That(outcome.TransactionRolledBack, Is.False);
|
|
foreach (StatusCode sc in outcome.OperationResults)
|
|
{
|
|
Assert.That(StatusCode.IsGood(sc), Is.True);
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Verifies that atomic insertion rolls back the batch on its first failure.
|
|
/// </summary>
|
|
[Test]
|
|
public async Task InsertAtomicRollsBackOnFirstFailureAsync()
|
|
{
|
|
using var provider = new InMemoryHistorianProvider(
|
|
new InMemoryHistorianOptions(),
|
|
new FakeTimeProvider(BaseTime));
|
|
var nodeId = new NodeId("tx.var", 1);
|
|
provider.Register(nodeId);
|
|
|
|
HistorianOperationContext context = CreateContext();
|
|
|
|
// Pre-existing entry at t=2 — will collide with the atomic insert below.
|
|
await provider.InsertAsync(context, nodeId,
|
|
[MakeValue(BaseTime.AddSeconds(2), 99.0)], CancellationToken.None).ConfigureAwait(false);
|
|
|
|
var batch = new List<DataValue>
|
|
{
|
|
MakeValue(BaseTime.AddSeconds(1), 1.0),
|
|
MakeValue(BaseTime.AddSeconds(2), 2.0), // collision
|
|
MakeValue(BaseTime.AddSeconds(3), 3.0)
|
|
};
|
|
|
|
HistorianUpdateOutcome<DataValue> outcome = await provider.InsertAtomicAsync(
|
|
context, nodeId, batch, CancellationToken.None).ConfigureAwait(false);
|
|
|
|
Assert.That(outcome.OperationResults, Has.Count.EqualTo(3));
|
|
Assert.That(outcome.TransactionRolledBack, Is.True);
|
|
Assert.That(outcome.OperationResults[1].Code, Is.EqualTo(StatusCodes.BadEntryExists.Code));
|
|
// Rollback markers on the other two slots.
|
|
Assert.That(outcome.OperationResults[0].Code, Is.EqualTo(StatusCodes.BadTransactionFailed.Code));
|
|
Assert.That(outcome.OperationResults[2].Code, Is.EqualTo(StatusCodes.BadTransactionFailed.Code));
|
|
|
|
// Verify nothing else was inserted.
|
|
HistorianPage<HistoricalDataValue> page = await provider.ReadRawAsync(
|
|
context,
|
|
new HistorianRawReadRequest
|
|
{
|
|
NodeId = nodeId,
|
|
StartTime = BaseTime,
|
|
EndTime = BaseTime.AddSeconds(10),
|
|
IsForward = true
|
|
},
|
|
default,
|
|
CancellationToken.None).ConfigureAwait(false);
|
|
|
|
Assert.That(page.Values, Has.Count.EqualTo(1),
|
|
"Only the pre-existing value should remain; rollback discarded the rest.");
|
|
}
|
|
|
|
private static readonly System.DateTime BaseTime
|
|
= new(2025, 1, 1, 0, 0, 0, System.DateTimeKind.Utc);
|
|
|
|
private static DataValue MakeValue(System.DateTime sourceTimestamp, double value)
|
|
{
|
|
return new DataValue(new Variant(value), StatusCodes.Good, sourceTimestamp: sourceTimestamp, serverTimestamp: sourceTimestamp);
|
|
}
|
|
|
|
private static HistorianOperationContext CreateContext()
|
|
{
|
|
var mockTelemetry = new Moq.Mock<ITelemetryContext>();
|
|
var mockServer = new Moq.Mock<IServerInternal>();
|
|
mockServer.Setup(s => s.NamespaceUris).Returns(new NamespaceTable());
|
|
mockServer.Setup(s => s.ServerUris).Returns(new StringTable());
|
|
mockServer.Setup(s => s.TypeTree).Returns(new TypeTable(new NamespaceTable()));
|
|
mockServer.Setup(s => s.Factory).Returns(EncodeableFactory.Create());
|
|
mockServer.Setup(s => s.Telemetry).Returns(mockTelemetry.Object);
|
|
|
|
var opContext = new OperationContext(
|
|
new RequestHeader(), null, RequestType.HistoryUpdate, RequestLifetime.None);
|
|
var systemContext = new ServerSystemContext(mockServer.Object, opContext);
|
|
return new HistorianOperationContext(
|
|
systemContext, opContext, null, HistoryUpdateType.Insert);
|
|
}
|
|
}
|
|
}
|