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>
293 lines
11 KiB
C#
293 lines
11 KiB
C#
/* ========================================================================
|
|
* Copyright (c) 2005-2026 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.Buffers.Binary;
|
|
using System.Collections.Generic;
|
|
using System.IO;
|
|
using System.Linq;
|
|
using System.Text;
|
|
using System.Text.Json;
|
|
using System.Text.Json.Nodes;
|
|
using System.Xml.Linq;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Core.TestFramework;
|
|
|
|
namespace Opc.Ua.Core.Encoders.Tests
|
|
{
|
|
/// <summary>
|
|
/// Verifies consistent Variant matrix validation across all supported codecs.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("Encoder")]
|
|
[Category("Matrix")]
|
|
[SetCulture("en-us")]
|
|
[SetUICulture("en-us")]
|
|
[Parallelizable]
|
|
public class VariantMatrixConformanceTests : EncoderCommon
|
|
{
|
|
[Theory]
|
|
public void Int32MatrixRoundTripsAcrossCodecs(
|
|
[ValueSource(nameof(EncodingTypesAll))] EncodingTypeGroup encoding)
|
|
{
|
|
MatrixOf<int> expected = new int[2, 3]
|
|
{
|
|
{ 1, 2, 3 },
|
|
{ 4, 5, 6 }
|
|
};
|
|
|
|
Variant actual = RoundTrip(encoding, Variant.From(expected));
|
|
MatrixOf<int> actualMatrix = actual.GetInt32Matrix();
|
|
|
|
Assert.That(actualMatrix.Dimensions, Has.Length.EqualTo(2));
|
|
Assert.That(actualMatrix.Dimensions[0], Is.EqualTo(2));
|
|
Assert.That(actualMatrix.Dimensions[1], Is.EqualTo(3));
|
|
Assert.That(actualMatrix.Count, Is.EqualTo(expected.Count));
|
|
for (int i = 0; i < expected.Count; i++)
|
|
{
|
|
Assert.That(actualMatrix.Span[i], Is.EqualTo(expected.Span[i]));
|
|
}
|
|
}
|
|
|
|
[Theory]
|
|
public void NullInt32ArrayDecodesAsNoElementsAcrossCodecs(
|
|
[ValueSource(nameof(EncodingTypesAll))] EncodingTypeGroup encoding)
|
|
{
|
|
Variant actual = RoundTripVariantValue(encoding, Variant.From(ArrayOf<int>.Null));
|
|
|
|
Assert.That(actual.TypeInfo, Is.EqualTo(TypeInfo.Arrays.Int32));
|
|
Assert.That(actual.GetInt32Array().Count, Is.Zero);
|
|
}
|
|
|
|
[Theory]
|
|
public void EmptyInt32ArrayRoundTripsAcrossCodecs(
|
|
[ValueSource(nameof(EncodingTypesAll))] EncodingTypeGroup encoding)
|
|
{
|
|
Variant actual = RoundTripVariantValue(encoding, Variant.From(ArrayOf<int>.Empty));
|
|
|
|
Assert.That(actual.TypeInfo, Is.EqualTo(TypeInfo.Arrays.Int32));
|
|
Assert.That(actual.GetInt32Array().IsNull, Is.False);
|
|
Assert.That(actual.GetInt32Array().Count, Is.Zero);
|
|
}
|
|
|
|
[Theory]
|
|
public void RankOneMatrixDimensionsAreRejectedAcrossCodecs(
|
|
[ValueSource(nameof(EncodingTypesAll))] EncodingTypeGroup encoding)
|
|
{
|
|
AssertInvalidDimensions(encoding, [6]);
|
|
}
|
|
|
|
[Theory]
|
|
public void ZeroMatrixDimensionIsRejectedAcrossCodecs(
|
|
[ValueSource(nameof(EncodingTypesAll))] EncodingTypeGroup encoding)
|
|
{
|
|
AssertInvalidDimensions(encoding, [2, 0]);
|
|
}
|
|
|
|
[Theory]
|
|
public void MatrixDimensionProductMismatchIsRejectedAcrossCodecs(
|
|
[ValueSource(nameof(EncodingTypesAll))] EncodingTypeGroup encoding)
|
|
{
|
|
AssertInvalidDimensions(encoding, [2, 2]);
|
|
}
|
|
|
|
private Variant RoundTrip(EncodingTypeGroup encoding, Variant value)
|
|
{
|
|
byte[] payload = EncodeDataValue(encoding, value);
|
|
return DecodeDataValue(encoding, payload).WrappedValue;
|
|
}
|
|
|
|
private Variant RoundTripVariantValue(EncodingTypeGroup encoding, Variant value)
|
|
{
|
|
using var stream = new MemoryStream();
|
|
using (IEncoder encoder = CreateEncoder(
|
|
encoding.EncoderType,
|
|
Context,
|
|
stream,
|
|
typeof(int),
|
|
encoding.JsonEncodingType))
|
|
{
|
|
encoder.WriteVariantValue("Value", value);
|
|
}
|
|
|
|
stream.Position = 0;
|
|
using IDecoder decoder = CreateDecoder(
|
|
encoding.EncoderType,
|
|
encoding.UseXmlParser,
|
|
Context,
|
|
stream,
|
|
typeof(int));
|
|
return decoder.ReadVariantValue("Value", value.TypeInfo);
|
|
}
|
|
|
|
private void AssertInvalidDimensions(EncodingTypeGroup encoding, int[] dimensions)
|
|
{
|
|
MatrixOf<int> matrix = new int[2, 3]
|
|
{
|
|
{ 1, 2, 3 },
|
|
{ 4, 5, 6 }
|
|
};
|
|
byte[] payload = EncodeDataValue(encoding, Variant.From(matrix));
|
|
byte[] invalidPayload = ReplaceDimensions(encoding.EncoderType, payload, dimensions);
|
|
|
|
ServiceResultException exception = Assert.Throws<ServiceResultException>(
|
|
() => DecodeDataValue(encoding, invalidPayload));
|
|
|
|
Assert.That(exception.StatusCode, Is.EqualTo(StatusCodes.BadDecodingError));
|
|
}
|
|
|
|
private byte[] EncodeDataValue(EncodingTypeGroup encoding, Variant value)
|
|
{
|
|
using var stream = new MemoryStream();
|
|
using (IEncoder encoder = CreateEncoder(
|
|
encoding.EncoderType,
|
|
Context,
|
|
stream,
|
|
typeof(DataValue),
|
|
encoding.JsonEncodingType))
|
|
{
|
|
encoder.WriteDataValue("DataValue", new DataValue(value));
|
|
}
|
|
return stream.ToArray();
|
|
}
|
|
|
|
private DataValue DecodeDataValue(EncodingTypeGroup encoding, byte[] payload)
|
|
{
|
|
using var stream = new MemoryStream(payload);
|
|
using IDecoder decoder = CreateDecoder(
|
|
encoding.EncoderType,
|
|
encoding.UseXmlParser,
|
|
Context,
|
|
stream,
|
|
typeof(DataValue));
|
|
return decoder.ReadDataValue("DataValue");
|
|
}
|
|
|
|
private static byte[] ReplaceDimensions(
|
|
EncodingType encodingType,
|
|
byte[] payload,
|
|
int[] dimensions)
|
|
{
|
|
return encodingType switch
|
|
{
|
|
EncodingType.Binary => ReplaceBinaryDimensions(payload, dimensions),
|
|
EncodingType.Json => ReplaceJsonDimensions(payload, dimensions),
|
|
EncodingType.Xml => ReplaceXmlDimensions(payload, dimensions),
|
|
_ => throw new ArgumentOutOfRangeException(nameof(encodingType), encodingType, null)
|
|
};
|
|
}
|
|
|
|
private static byte[] ReplaceBinaryDimensions(byte[] payload, int[] dimensions)
|
|
{
|
|
const int originalDimensionCount = 2;
|
|
int originalDimensionBytes = sizeof(int) * (originalDimensionCount + 1);
|
|
int prefixLength = payload.Length - originalDimensionBytes;
|
|
Assert.That(
|
|
BinaryPrimitives.ReadInt32LittleEndian(payload.AsSpan(prefixLength, sizeof(int))),
|
|
Is.EqualTo(originalDimensionCount));
|
|
|
|
byte[] result = new byte[prefixLength + (sizeof(int) * (dimensions.Length + 1))];
|
|
payload.AsSpan(0, prefixLength).CopyTo(result);
|
|
Span<byte> destination = result.AsSpan(prefixLength);
|
|
BinaryPrimitives.WriteInt32LittleEndian(destination, dimensions.Length);
|
|
for (int i = 0; i < dimensions.Length; i++)
|
|
{
|
|
BinaryPrimitives.WriteInt32LittleEndian(
|
|
destination[((i + 1) * sizeof(int))..],
|
|
dimensions[i]);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
private static byte[] ReplaceJsonDimensions(byte[] payload, int[] dimensions)
|
|
{
|
|
JsonNode root = JsonNode.Parse(payload)
|
|
?? throw new InvalidOperationException("The encoded JSON payload is empty.");
|
|
JsonObject owner = FindJsonDimensionsOwner(root)
|
|
?? throw new InvalidOperationException("The encoded JSON payload has no Dimensions property.");
|
|
var replacement = new JsonArray();
|
|
for (int i = 0; i < dimensions.Length; i++)
|
|
{
|
|
replacement.Add(dimensions[i]);
|
|
}
|
|
owner["Dimensions"] = replacement;
|
|
return JsonSerializer.SerializeToUtf8Bytes(root);
|
|
}
|
|
|
|
private static JsonObject FindJsonDimensionsOwner(JsonNode node)
|
|
{
|
|
if (node is JsonObject jsonObject)
|
|
{
|
|
if (jsonObject.ContainsKey("Dimensions"))
|
|
{
|
|
return jsonObject;
|
|
}
|
|
foreach (KeyValuePair<string, JsonNode?> property in jsonObject)
|
|
{
|
|
JsonNode child = property.Value!;
|
|
if (child != null && FindJsonDimensionsOwner(child) is JsonObject owner)
|
|
{
|
|
return owner;
|
|
}
|
|
}
|
|
}
|
|
else if (node is JsonArray jsonArray)
|
|
{
|
|
for (int i = 0; i < jsonArray.Count; i++)
|
|
{
|
|
if (jsonArray[i] != null &&
|
|
FindJsonDimensionsOwner(jsonArray[i]!) is JsonObject owner)
|
|
{
|
|
return owner;
|
|
}
|
|
}
|
|
}
|
|
return null!;
|
|
}
|
|
|
|
private static byte[] ReplaceXmlDimensions(byte[] payload, int[] dimensions)
|
|
{
|
|
using var stream = new MemoryStream(payload);
|
|
XDocument document = XDocument.Load(stream);
|
|
XElement dimensionsElement = document.Root?
|
|
.DescendantsAndSelf()
|
|
.FirstOrDefault(element => element.Name.LocalName == "Dimensions")
|
|
?? throw new InvalidOperationException("The encoded XML payload has no Dimensions element.");
|
|
XNamespace ns = dimensionsElement.Name.Namespace;
|
|
var elements = new XElement[dimensions.Length];
|
|
for (int i = 0; i < dimensions.Length; i++)
|
|
{
|
|
elements[i] = new XElement(ns + "Int32", dimensions[i]);
|
|
}
|
|
dimensionsElement.ReplaceNodes(elements);
|
|
return Encoding.UTF8.GetBytes(document.ToString(SaveOptions.DisableFormatting));
|
|
}
|
|
}
|
|
}
|