mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-21 00:56:28 +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>
294 lines
15 KiB
C#
294 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.Concurrent;
|
|
using System.Linq;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Client.Tests.Stack.Client.Fakes;
|
|
|
|
namespace Opc.Ua.Client.Tests
|
|
{
|
|
[TestFixture]
|
|
[Parallelizable]
|
|
[Category("Client")]
|
|
public sealed class SessionTransferAcknowledgementTests
|
|
{
|
|
public enum TransferSequenceSet
|
|
{
|
|
Empty,
|
|
Consecutive,
|
|
Gapped
|
|
}
|
|
|
|
[Test]
|
|
[Combinatorial]
|
|
public async Task TransferAcknowledgementsWaitForRequestedRepublishAsync(
|
|
[Values] bool republishAfterTransfer,
|
|
[Values] bool sequentialPublishing,
|
|
[Values] TransferSequenceSet sequenceSet,
|
|
[Values] bool changePreferenceDuringTransfer)
|
|
{
|
|
ArrayOf<uint> availableSequenceNumbers = sequenceSet switch
|
|
{
|
|
TransferSequenceSet.Empty => [],
|
|
TransferSequenceSet.Consecutive => [1, 2],
|
|
TransferSequenceSet.Gapped => [4, 1, 3],
|
|
_ => throw new ArgumentOutOfRangeException(nameof(sequenceSet))
|
|
};
|
|
ArrayOf<uint> replayedSequenceNumbers = !republishAfterTransfer ? [] : sequenceSet switch
|
|
{
|
|
TransferSequenceSet.Empty => [],
|
|
TransferSequenceSet.Consecutive => [1, 2],
|
|
TransferSequenceSet.Gapped => [3, 4],
|
|
_ => throw new ArgumentOutOfRangeException(nameof(sequenceSet))
|
|
};
|
|
ArrayOf<uint> immediateAcknowledgements = !republishAfterTransfer
|
|
? availableSequenceNumbers
|
|
: sequenceSet == TransferSequenceSet.Gapped ? [1] : [];
|
|
await using var harness = new SessionChannelHarness();
|
|
ConfiguredEndpoint endpoint = SessionChannelHarness.CreateEndpoint();
|
|
ScriptedChannel originChannel = harness.CreateOpenedStandaloneChannel(endpoint);
|
|
ScriptedChannel targetChannel = harness.CreateOpenedStandaloneChannel(endpoint);
|
|
var originPublish = new AsyncOperationGate();
|
|
var targetPublish = new AsyncOperationGate();
|
|
var republish = new AsyncOperationGate();
|
|
var finalPublish = new AsyncOperationGate();
|
|
var firstRequest = new TaskCompletionSource<PublishRequest>(
|
|
TaskCreationOptions.RunContinuationsAsynchronously);
|
|
var secondRequest = new TaskCompletionSource<PublishRequest>(
|
|
TaskCreationOptions.RunContinuationsAsynchronously);
|
|
var notificationsReceived = new TaskCompletionSource<bool>(
|
|
TaskCreationOptions.RunContinuationsAsynchronously);
|
|
var notifications = new ConcurrentQueue<DataChangeNotification>();
|
|
int publishCount = 0;
|
|
int republishCount = 0;
|
|
int preferenceChanged = 0;
|
|
|
|
originChannel.RequestHandler = async (request, ct) =>
|
|
{
|
|
switch (request)
|
|
{
|
|
case CreateSubscriptionRequest create:
|
|
return new CreateSubscriptionResponse
|
|
{
|
|
ResponseHeader = originChannel.CreateGoodHeader(),
|
|
SubscriptionId = 1,
|
|
RevisedPublishingInterval = create.RequestedPublishingInterval,
|
|
RevisedLifetimeCount = create.RequestedLifetimeCount,
|
|
RevisedMaxKeepAliveCount = create.RequestedMaxKeepAliveCount
|
|
};
|
|
case PublishRequest:
|
|
await originPublish.WaitAsync(ct).ConfigureAwait(false);
|
|
throw new ServiceResultException(StatusCodes.BadSessionClosed);
|
|
case SetPublishingModeRequest publishing:
|
|
return new SetPublishingModeResponse
|
|
{
|
|
ResponseHeader = originChannel.CreateGoodHeader(),
|
|
Results = publishing.SubscriptionIds.ConvertAll(_ => StatusCodes.Good)
|
|
};
|
|
default:
|
|
return originChannel.CreateResponse(request);
|
|
}
|
|
};
|
|
targetChannel.RequestHandler = async (request, ct) =>
|
|
{
|
|
switch (request)
|
|
{
|
|
case CreateSessionRequest:
|
|
var created = (CreateSessionResponse)targetChannel.CreateResponse(request);
|
|
created.SessionId = new NodeId(2u, 1);
|
|
created.AuthenticationToken = new NodeId(102u, 1);
|
|
return created;
|
|
case TransferSubscriptionsRequest transfer:
|
|
return new TransferSubscriptionsResponse
|
|
{
|
|
ResponseHeader = targetChannel.CreateGoodHeader(),
|
|
Results = transfer.SubscriptionIds.ConvertAll(_ => new TransferResult
|
|
{
|
|
StatusCode = StatusCodes.Good,
|
|
AvailableSequenceNumbers = availableSequenceNumbers
|
|
})
|
|
};
|
|
case RepublishRequest replay:
|
|
Interlocked.Increment(ref republishCount);
|
|
await republish.WaitAsync(ct).ConfigureAwait(false);
|
|
return new RepublishResponse
|
|
{
|
|
ResponseHeader = targetChannel.CreateGoodHeader(),
|
|
NotificationMessage = new NotificationMessage
|
|
{
|
|
SequenceNumber = replay.RetransmitSequenceNumber,
|
|
NotificationData =
|
|
[
|
|
new ExtensionObject(new DataChangeNotification
|
|
{
|
|
MonitoredItems =
|
|
[
|
|
new MonitoredItemNotification
|
|
{
|
|
ClientHandle = 1,
|
|
Value = new DataValue(new Variant(replay.RetransmitSequenceNumber))
|
|
}
|
|
]
|
|
})
|
|
]
|
|
}
|
|
};
|
|
case PublishRequest publish when Interlocked.Increment(ref publishCount) == 1:
|
|
firstRequest.TrySetResult(publish);
|
|
await targetPublish.WaitAsync(ct).ConfigureAwait(false);
|
|
return new PublishResponse
|
|
{
|
|
ResponseHeader = targetChannel.CreateGoodHeader(),
|
|
SubscriptionId = 1,
|
|
Results = publish.SubscriptionAcknowledgements.ConvertAll(_ => StatusCodes.Good),
|
|
AvailableSequenceNumbers = replayedSequenceNumbers,
|
|
NotificationMessage = new NotificationMessage
|
|
{
|
|
SequenceNumber = sequenceSet switch
|
|
{
|
|
TransferSequenceSet.Empty => 1,
|
|
TransferSequenceSet.Consecutive => 3,
|
|
TransferSequenceSet.Gapped => 5,
|
|
_ => throw new ArgumentOutOfRangeException(nameof(sequenceSet))
|
|
}
|
|
}
|
|
};
|
|
case PublishRequest publish:
|
|
secondRequest.TrySetResult(publish);
|
|
await finalPublish.WaitAsync(ct).ConfigureAwait(false);
|
|
throw new ServiceResultException(StatusCodes.BadSessionClosed);
|
|
default:
|
|
return targetChannel.CreateResponse(request);
|
|
}
|
|
};
|
|
|
|
await using var origin = new Session(
|
|
originChannel.Channel, harness.Configuration, endpoint,
|
|
engineFactory: ClassicSubscriptionEngineFactory.Instance);
|
|
await using var target = new Session(
|
|
targetChannel.Channel, harness.Configuration, endpoint,
|
|
engineFactory: ClassicSubscriptionEngineFactory.Instance);
|
|
target.MinPublishRequestCount = 1;
|
|
target.MaxPublishRequestCount = 1;
|
|
using var subscription = new Subscription(origin.DefaultSubscription)
|
|
{
|
|
PublishingInterval = 1_000,
|
|
KeepAliveCount = 10,
|
|
LifetimeCount = 100,
|
|
PublishingEnabled = true,
|
|
RepublishAfterTransfer = republishAfterTransfer,
|
|
SequentialPublishing = sequentialPublishing,
|
|
DisableMonitoredItemCache = true,
|
|
FastDataChangeCallback = (_, notification, _) =>
|
|
{
|
|
notifications.Enqueue(notification);
|
|
if (notifications.Count == replayedSequenceNumbers.Count)
|
|
{
|
|
notificationsReceived.TrySetResult(true);
|
|
}
|
|
}
|
|
};
|
|
subscription.StateChanged += (_, args) =>
|
|
{
|
|
if (changePreferenceDuringTransfer &&
|
|
(args.Status & SubscriptionChangeMask.Transferred) != 0 &&
|
|
Interlocked.CompareExchange(ref preferenceChanged, 1, 0) == 0)
|
|
{
|
|
subscription.RepublishAfterTransfer = !republishAfterTransfer;
|
|
}
|
|
};
|
|
try
|
|
{
|
|
await origin.OpenAsync("origin", new UserIdentity(), CancellationToken.None).ConfigureAwait(false);
|
|
await target.OpenAsync("target", new UserIdentity(), CancellationToken.None).ConfigureAwait(false);
|
|
Assert.That(origin.AddSubscription(subscription), Is.True);
|
|
await subscription.CreateAsync().ConfigureAwait(false);
|
|
Assert.That(
|
|
await target.TransferSubscriptionsAsync([subscription], false, CancellationToken.None)
|
|
.ConfigureAwait(false),
|
|
Is.True);
|
|
Assert.That(subscription.AvailableSequenceNumbers.ToArray(),
|
|
Is.EqualTo(availableSequenceNumbers.ToArray()));
|
|
Assert.That(preferenceChanged, Is.EqualTo(changePreferenceDuringTransfer ? 1 : 0));
|
|
|
|
PublishRequest first = await firstRequest.Task.WaitAsync(s_timeout).ConfigureAwait(false);
|
|
Assert.That(
|
|
first.SubscriptionAcknowledgements.ToArray()!.Select(ack => ack.SequenceNumber),
|
|
Is.EquivalentTo(immediateAcknowledgements.ToArray()!),
|
|
"Transfer must not acknowledge messages whose Republish responses are still blocked.");
|
|
|
|
if (!replayedSequenceNumbers.IsEmpty)
|
|
{
|
|
await republish.Entered.WaitAsync(s_timeout).ConfigureAwait(false);
|
|
Assert.That(notifications, Is.Empty);
|
|
republish.Release();
|
|
await notificationsReceived.Task.WaitAsync(s_timeout).ConfigureAwait(false);
|
|
Assert.That(notifications.Select(notification => notification.SequenceNumber),
|
|
Is.EquivalentTo(replayedSequenceNumbers.ToArray()!));
|
|
foreach (DataChangeNotification notification in notifications)
|
|
{
|
|
Assert.That(notification.MonitoredItems.Count, Is.EqualTo(1));
|
|
Assert.That(notification.MonitoredItems[0].Value.WrappedValue,
|
|
Is.EqualTo(new Variant(notification.SequenceNumber)));
|
|
}
|
|
Assert.That(republishCount, Is.EqualTo(replayedSequenceNumbers.Count));
|
|
}
|
|
else
|
|
{
|
|
Assert.That(republishCount, Is.Zero);
|
|
Assert.That(notifications, Is.Empty);
|
|
}
|
|
|
|
targetPublish.Release();
|
|
PublishRequest next = await secondRequest.Task.WaitAsync(s_timeout).ConfigureAwait(false);
|
|
Assert.That(
|
|
next.SubscriptionAcknowledgements.ToArray()!.Select(ack => ack.SequenceNumber),
|
|
Is.EquivalentTo(replayedSequenceNumbers.ToArray()!));
|
|
Assert.That(
|
|
first.SubscriptionAcknowledgements.ToArray()!.Concat(next.SubscriptionAcknowledgements.ToArray()!)
|
|
.Select(ack => ack.SubscriptionId),
|
|
Is.EqualTo(Enumerable.Repeat(1u, availableSequenceNumbers.Count)));
|
|
}
|
|
finally
|
|
{
|
|
originPublish.Release();
|
|
republish.Release();
|
|
targetPublish.Release();
|
|
finalPublish.Release();
|
|
}
|
|
}
|
|
|
|
private static readonly TimeSpan s_timeout = TimeSpan.FromSeconds(5);
|
|
}
|
|
}
|