mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-22 01:26:20 +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>
363 lines
14 KiB
C#
363 lines
14 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.Threading;
|
|
using System.Threading.Tasks;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Client.TestFramework;
|
|
|
|
namespace Opc.Ua.Subscriptions.Tests
|
|
{
|
|
/// <summary>
|
|
/// Integration tests for the server wide MinSupportedSamplingInterval configuration option
|
|
/// and its interplay with the MinimumSamplingInterval declared by a node. The fixture
|
|
/// starts a reference server that advertises a non-zero minimum supported sampling interval.
|
|
/// </summary>
|
|
[NonParallelizable]
|
|
[TestFixture]
|
|
[Category("Subscription")]
|
|
[Category("MonitoredItem")]
|
|
[Category("MinSupportedSamplingInterval")]
|
|
public class MinSupportedSamplingIntervalTests : TestFixture
|
|
{
|
|
/// <summary>
|
|
/// Chosen so that it is above the MinimumSamplingInterval of
|
|
/// <c>Scalar_Static_Float</c> (100 ms) and below the MinimumSamplingInterval of
|
|
/// <c>Server.ServerStatus.CurrentTime</c> (1000 ms), which lets a single server
|
|
/// cover both directions of the interplay.
|
|
/// </summary>
|
|
private const double kMinSupportedSamplingInterval = 500;
|
|
|
|
private const double kNodeMinimumAboveFloor = 1000;
|
|
private const double kRequestedBelowFloor = 10;
|
|
private const double kPublishingInterval = 1000;
|
|
|
|
protected override void ConfigureServer(ApplicationConfiguration configuration)
|
|
{
|
|
configuration.ServerConfiguration!.MinSupportedSamplingInterval = kMinSupportedSamplingInterval;
|
|
}
|
|
|
|
[SetUp]
|
|
public async Task SetUp()
|
|
{
|
|
m_subscriptionId = await CreateSetupSubscriptionAsync(
|
|
publishingInterval: kPublishingInterval,
|
|
requestedLifetimeCount: 100,
|
|
requestedMaxKeepAliveCount: 10).ConfigureAwait(false);
|
|
}
|
|
|
|
[TearDown]
|
|
public async Task TearDown()
|
|
{
|
|
if (m_subscriptionId > 0)
|
|
{
|
|
await Session.DeleteSubscriptionsAsync(
|
|
null,
|
|
new uint[] { m_subscriptionId }.ToArrayOf(),
|
|
CancellationToken.None).ConfigureAwait(false);
|
|
m_subscriptionId = 0;
|
|
}
|
|
}
|
|
|
|
[Test]
|
|
public async Task ServerCapabilitiesReportsConfiguredMinSupportedSamplingIntervalAsync()
|
|
{
|
|
ReadResponse response = await Session.ReadAsync(
|
|
null,
|
|
0,
|
|
TimestampsToReturn.Neither,
|
|
new ReadValueId[]
|
|
{
|
|
new()
|
|
{
|
|
NodeId = VariableIds.Server_ServerCapabilities_MinSupportedSampleRate,
|
|
AttributeId = Attributes.Value
|
|
}
|
|
}.ToArrayOf(),
|
|
CancellationToken.None).ConfigureAwait(false);
|
|
|
|
Assert.That(StatusCode.IsGood(response.Results[0].StatusCode), Is.True);
|
|
Assert.That(
|
|
response.Results[0].WrappedValue.GetDouble(),
|
|
Is.EqualTo(kMinSupportedSamplingInterval),
|
|
"MinSupportedSamplingInterval must reflect the configured value.");
|
|
}
|
|
|
|
[Test]
|
|
public async Task SamplingIntervalBelowMinSupportedSamplingIntervalIsRevisedAsync()
|
|
{
|
|
NodeId nodeId = ToNodeId(Constants.ScalarStaticFloat);
|
|
|
|
MonitoredItemCreateResult result = await CreateItemAsync(
|
|
nodeId,
|
|
kRequestedBelowFloor).ConfigureAwait(false);
|
|
|
|
Assert.That(StatusCode.IsGood(result.StatusCode), Is.True);
|
|
Assert.That(
|
|
result.RevisedSamplingInterval,
|
|
Is.EqualTo(kMinSupportedSamplingInterval),
|
|
"The server wide minimum must raise a node minimum of 100 ms to 500 ms.");
|
|
}
|
|
|
|
[Test]
|
|
public async Task NodeMinimumSamplingIntervalAboveFloorWinsAsync()
|
|
{
|
|
NodeId nodeId = ToNodeId(
|
|
new ExpandedNodeId(
|
|
"Scalar_Static_Arrays2D_LocalizedText",
|
|
Constants.ReferenceServerNamespaceUri));
|
|
|
|
MonitoredItemCreateResult result = await CreateItemAsync(
|
|
nodeId,
|
|
kRequestedBelowFloor).ConfigureAwait(false);
|
|
|
|
Assert.That(StatusCode.IsGood(result.StatusCode), Is.True);
|
|
Assert.That(
|
|
result.RevisedSamplingInterval,
|
|
Is.EqualTo(kNodeMinimumAboveFloor),
|
|
"A node minimum above the server wide minimum must win.");
|
|
}
|
|
|
|
[Test]
|
|
public async Task ServerStatusCurrentTimeIsRaisedToMinSupportedSamplingIntervalAsync()
|
|
{
|
|
// the reference server declares a MinimumSamplingInterval of 250 ms for
|
|
// CurrentTime, which is below the configured minimum supported sampling interval.
|
|
MonitoredItemCreateResult result = await CreateItemAsync(
|
|
VariableIds.Server_ServerStatus_CurrentTime,
|
|
kRequestedBelowFloor).ConfigureAwait(false);
|
|
|
|
Assert.That(StatusCode.IsGood(result.StatusCode), Is.True);
|
|
Assert.That(
|
|
result.RevisedSamplingInterval,
|
|
Is.EqualTo(kMinSupportedSamplingInterval));
|
|
}
|
|
|
|
[Test]
|
|
public async Task ContinuousNodeBypassesMinSupportedSamplingIntervalAsync()
|
|
{
|
|
NodeId nodeId = ToNodeId(Constants.ScalarStaticInt32);
|
|
|
|
MonitoredItemCreateResult result = await CreateItemAsync(
|
|
nodeId,
|
|
kRequestedBelowFloor).ConfigureAwait(false);
|
|
|
|
Assert.That(StatusCode.IsGood(result.StatusCode), Is.True);
|
|
Assert.That(
|
|
result.RevisedSamplingInterval,
|
|
Is.EqualTo(kRequestedBelowFloor),
|
|
"Nodes that report by exception are not bound by the minimum supported sampling interval.");
|
|
}
|
|
|
|
[Test]
|
|
public async Task NonValueAttributeIsBoundByMinSupportedSamplingIntervalAsync()
|
|
{
|
|
NodeId nodeId = ToNodeId(Constants.ScalarStaticInt32);
|
|
|
|
MonitoredItemCreateResult result = await CreateItemAsync(
|
|
nodeId,
|
|
kRequestedBelowFloor,
|
|
attributeId: Attributes.DisplayName).ConfigureAwait(false);
|
|
|
|
Assert.That(StatusCode.IsGood(result.StatusCode), Is.True);
|
|
Assert.That(
|
|
result.RevisedSamplingInterval,
|
|
Is.EqualTo(kMinSupportedSamplingInterval),
|
|
"Attributes other than Value do not declare a MinimumSamplingInterval.");
|
|
}
|
|
|
|
[Test]
|
|
public async Task SamplingIntervalAboveMinSupportedSamplingIntervalIsKeptAsync()
|
|
{
|
|
NodeId nodeId = ToNodeId(Constants.ScalarStaticFloat);
|
|
|
|
MonitoredItemCreateResult result = await CreateItemAsync(
|
|
nodeId,
|
|
5000).ConfigureAwait(false);
|
|
|
|
Assert.That(StatusCode.IsGood(result.StatusCode), Is.True);
|
|
Assert.That(result.RevisedSamplingInterval, Is.EqualTo(5000.0));
|
|
}
|
|
|
|
[Test]
|
|
public async Task NegativeSamplingIntervalUsesPublishingIntervalAndFloorAsync()
|
|
{
|
|
NodeId nodeId = ToNodeId(Constants.ScalarStaticFloat);
|
|
|
|
MonitoredItemCreateResult result = await CreateItemAsync(
|
|
nodeId,
|
|
-1).ConfigureAwait(false);
|
|
|
|
Assert.That(StatusCode.IsGood(result.StatusCode), Is.True);
|
|
Assert.That(
|
|
result.RevisedSamplingInterval,
|
|
Is.EqualTo(kPublishingInterval),
|
|
"A negative sampling interval resolves to the publishing interval.");
|
|
}
|
|
|
|
[Test]
|
|
public async Task ModifyMonitoredItemBelowMinSupportedSamplingIntervalIsRevisedAsync()
|
|
{
|
|
NodeId nodeId = ToNodeId(Constants.ScalarStaticFloat);
|
|
|
|
MonitoredItemCreateResult createResult = await CreateItemAsync(
|
|
nodeId,
|
|
5000).ConfigureAwait(false);
|
|
|
|
Assert.That(StatusCode.IsGood(createResult.StatusCode), Is.True);
|
|
|
|
ModifyMonitoredItemsResponse modifyResponse = await Session.ModifyMonitoredItemsAsync(
|
|
null,
|
|
m_subscriptionId,
|
|
TimestampsToReturn.Both,
|
|
new MonitoredItemModifyRequest[]
|
|
{
|
|
new()
|
|
{
|
|
MonitoredItemId = createResult.MonitoredItemId,
|
|
RequestedParameters = new MonitoringParameters
|
|
{
|
|
ClientHandle = 1,
|
|
SamplingInterval = kRequestedBelowFloor,
|
|
QueueSize = 10,
|
|
DiscardOldest = true
|
|
}
|
|
}
|
|
}.ToArrayOf(),
|
|
CancellationToken.None).ConfigureAwait(false);
|
|
|
|
Assert.That(StatusCode.IsGood(modifyResponse.Results[0].StatusCode), Is.True);
|
|
Assert.That(
|
|
modifyResponse.Results[0].RevisedSamplingInterval,
|
|
Is.EqualTo(kMinSupportedSamplingInterval));
|
|
}
|
|
|
|
[Test]
|
|
public async Task ModifyMonitoredItemOnContinuousNodeBypassesFloorAsync()
|
|
{
|
|
NodeId nodeId = ToNodeId(Constants.ScalarStaticInt32);
|
|
|
|
MonitoredItemCreateResult createResult = await CreateItemAsync(
|
|
nodeId,
|
|
5000).ConfigureAwait(false);
|
|
|
|
Assert.That(StatusCode.IsGood(createResult.StatusCode), Is.True);
|
|
|
|
ModifyMonitoredItemsResponse modifyResponse = await Session.ModifyMonitoredItemsAsync(
|
|
null,
|
|
m_subscriptionId,
|
|
TimestampsToReturn.Both,
|
|
new MonitoredItemModifyRequest[]
|
|
{
|
|
new()
|
|
{
|
|
MonitoredItemId = createResult.MonitoredItemId,
|
|
RequestedParameters = new MonitoringParameters
|
|
{
|
|
ClientHandle = 1,
|
|
SamplingInterval = kRequestedBelowFloor,
|
|
QueueSize = 10,
|
|
DiscardOldest = true
|
|
}
|
|
}
|
|
}.ToArrayOf(),
|
|
CancellationToken.None).ConfigureAwait(false);
|
|
|
|
Assert.That(StatusCode.IsGood(modifyResponse.Results[0].StatusCode), Is.True);
|
|
Assert.That(
|
|
modifyResponse.Results[0].RevisedSamplingInterval,
|
|
Is.EqualTo(kRequestedBelowFloor));
|
|
}
|
|
|
|
[Test]
|
|
public async Task EventMonitoredItemIsNotBoundByMinSupportedSamplingIntervalAsync()
|
|
{
|
|
var filter = new EventFilter();
|
|
filter.AddSelectClause(
|
|
ObjectTypeIds.BaseEventType,
|
|
QualifiedName.From(BrowseNames.EventId));
|
|
filter.AddSelectClause(
|
|
ObjectTypeIds.BaseEventType,
|
|
QualifiedName.From(BrowseNames.Message));
|
|
|
|
MonitoredItemCreateResult result = await CreateItemAsync(
|
|
ObjectIds.Server,
|
|
kRequestedBelowFloor,
|
|
attributeId: Attributes.EventNotifier,
|
|
filter: new ExtensionObject(filter)).ConfigureAwait(false);
|
|
|
|
Assert.That(StatusCode.IsGood(result.StatusCode), Is.True);
|
|
Assert.That(
|
|
result.RevisedSamplingInterval,
|
|
Is.EqualTo(kRequestedBelowFloor),
|
|
"Event monitored items are not bound by the minimum supported sampling interval.");
|
|
}
|
|
|
|
private async Task<MonitoredItemCreateResult> CreateItemAsync(
|
|
NodeId nodeId,
|
|
double samplingInterval,
|
|
uint attributeId = Attributes.Value,
|
|
ExtensionObject filter = default)
|
|
{
|
|
CreateMonitoredItemsResponse response = await Session.CreateMonitoredItemsAsync(
|
|
null,
|
|
m_subscriptionId,
|
|
TimestampsToReturn.Both,
|
|
new MonitoredItemCreateRequest[]
|
|
{
|
|
new()
|
|
{
|
|
ItemToMonitor = new ReadValueId
|
|
{
|
|
NodeId = nodeId,
|
|
AttributeId = attributeId
|
|
},
|
|
MonitoringMode = MonitoringMode.Reporting,
|
|
RequestedParameters = new MonitoringParameters
|
|
{
|
|
ClientHandle = 1,
|
|
SamplingInterval = samplingInterval,
|
|
Filter = filter,
|
|
DiscardOldest = true,
|
|
QueueSize = 10
|
|
}
|
|
}
|
|
}.ToArrayOf(),
|
|
CancellationToken.None).ConfigureAwait(false);
|
|
|
|
Assert.That(StatusCode.IsGood(response.ResponseHeader.ServiceResult), Is.True);
|
|
Assert.That(response.Results.Count, Is.EqualTo(1));
|
|
|
|
return response.Results[0];
|
|
}
|
|
|
|
private uint m_subscriptionId;
|
|
}
|
|
}
|