mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-20 16:52:07 +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>
181 lines
8.0 KiB
C#
181 lines
8.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/
|
|
* ======================================================================*/
|
|
|
|
using System;
|
|
using System.IO;
|
|
using System.Linq;
|
|
using System.Text;
|
|
using Microsoft.Extensions.Logging;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Tests;
|
|
|
|
namespace Opc.Ua.SourceGeneration.Generator.Tests
|
|
{
|
|
/// <summary>
|
|
/// The StructureType of a generated StructureDefinition describes the
|
|
/// whole encoding, inherited fields included.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("Generator")]
|
|
[SetCulture("en-us")]
|
|
[SetUICulture("en-us")]
|
|
[Parallelizable]
|
|
public class StructureDefinitionKindTests
|
|
{
|
|
/// <summary>
|
|
/// A3-5: a subtype of a structure with an AllowSubTypes field
|
|
/// inherits that field, which the base Encode writes as an
|
|
/// ExtensionObject, so its definition must be
|
|
/// StructureWithSubtypedValues with the inherited field flagged,
|
|
/// with and without own fields.
|
|
/// </summary>
|
|
[Test]
|
|
public void SubtypeOfStructureWithSubtypedValuesInheritsTheKind()
|
|
{
|
|
string dataTypes = GenerateDataTypes(Design);
|
|
|
|
string withFields = GetDefinition(dataTypes, "DerivedWithFields");
|
|
Assert.That(withFields, Does.Contain(
|
|
"StructureType = global::Opc.Ua.StructureType.StructureWithSubtypedValues"));
|
|
Assert.That(GetField(withFields, "Payload"), Does.Contain("IsOptional = true"));
|
|
Assert.That(GetField(withFields, "Count"), Does.Contain("IsOptional = false"));
|
|
|
|
string withoutFields = GetDefinition(dataTypes, "DerivedWithoutFields");
|
|
Assert.That(withoutFields, Does.Contain(
|
|
"StructureType = global::Opc.Ua.StructureType.StructureWithSubtypedValues"));
|
|
Assert.That(GetField(withoutFields, "Payload"), Does.Contain("IsOptional = true"));
|
|
|
|
// The base keeps its kind.
|
|
Assert.That(GetDefinition(dataTypes, "SubtypedBase"), Does.Contain(
|
|
"StructureType = global::Opc.Ua.StructureType.StructureWithSubtypedValues"));
|
|
}
|
|
|
|
private static string GetDefinition(string source, string typeName)
|
|
{
|
|
int start = source.IndexOf(
|
|
"public static global::Opc.Ua.StructureDefinition Create" + typeName + "(",
|
|
StringComparison.Ordinal);
|
|
Assert.That(start, Is.GreaterThanOrEqualTo(0), typeName + " definition not found");
|
|
int end = source.IndexOf("public static global::Opc.Ua.", start + 1, StringComparison.Ordinal);
|
|
return end < 0 ? source[start..] : source[start..end];
|
|
}
|
|
|
|
private static string GetField(string definition, string fieldName)
|
|
{
|
|
int start = definition.IndexOf("Name = \"" + fieldName + "\"", StringComparison.Ordinal);
|
|
Assert.That(start, Is.GreaterThanOrEqualTo(0), fieldName + " field not found");
|
|
int end = definition.IndexOf("new global::Opc.Ua.StructureField", start, StringComparison.Ordinal);
|
|
return end < 0 ? definition[start..] : definition[start..end];
|
|
}
|
|
|
|
private static string GenerateDataTypes(string design)
|
|
{
|
|
string root = Path.Combine(Path.GetTempPath(), "UA-" + Guid.NewGuid().ToString("N"));
|
|
Directory.CreateDirectory(root);
|
|
try
|
|
{
|
|
string path = Path.Combine(root, "Model.xml");
|
|
File.WriteAllText(path, design);
|
|
ITelemetryContext telemetry = NUnitTelemetryContext.Create(logLevel: LogLevel.Error);
|
|
using var fileSystem = new VirtualFileSystem();
|
|
Generators.GenerateCode(
|
|
new DesignFileCollection
|
|
{
|
|
Targets = [path],
|
|
Dependencies = [path],
|
|
Options = new DesignFileOptions()
|
|
},
|
|
fileSystem,
|
|
string.Empty,
|
|
telemetry,
|
|
new GeneratorOptions
|
|
{
|
|
OmitFluentApi = true,
|
|
OmitEventRecords = true
|
|
},
|
|
useAllowSubtypes: true,
|
|
identifierFiles: null!,
|
|
referencedModels: null!,
|
|
nodeManagerBindings: null!,
|
|
reportBindingDiagnostic: null!,
|
|
sharedUsedBindings: null!,
|
|
bindingModelCount: 0,
|
|
reportFluentAccessorsOnlyDiagnostic: null!,
|
|
referencedModelProviders: null!,
|
|
referencedAccessorProviders: null!);
|
|
string file = fileSystem.CreatedFiles
|
|
.Single(f => f.EndsWith("DataTypes.g.cs", StringComparison.Ordinal));
|
|
return Encoding.UTF8.GetString(fileSystem.Get(file));
|
|
}
|
|
finally
|
|
{
|
|
try
|
|
{
|
|
Directory.Delete(root, true);
|
|
}
|
|
catch (IOException)
|
|
{
|
|
}
|
|
}
|
|
}
|
|
|
|
private const string Design =
|
|
"""
|
|
<?xml version="1.0" encoding="utf-8" ?>
|
|
<opc:ModelDesign
|
|
xmlns:opc="http://opcfoundation.org/UA/ModelDesign.xsd"
|
|
xmlns:ua="http://opcfoundation.org/UA/"
|
|
xmlns="http://test.org/UA/Kinds/"
|
|
TargetNamespace="http://test.org/UA/Kinds/">
|
|
<opc:Namespaces>
|
|
<opc:Namespace Name="OpcUa" Prefix="Opc.Ua" XmlNamespace="http://opcfoundation.org/UA/2008/02/Types.xsd">http://opcfoundation.org/UA/</opc:Namespace>
|
|
<opc:Namespace Name="Kinds" Prefix="Test.Kinds">http://test.org/UA/Kinds/</opc:Namespace>
|
|
</opc:Namespaces>
|
|
<opc:DataType SymbolicName="PayloadStruct" BaseType="ua:Structure">
|
|
<opc:Fields>
|
|
<opc:Field Name="Value" DataType="ua:Int32" />
|
|
</opc:Fields>
|
|
</opc:DataType>
|
|
<opc:DataType SymbolicName="SubtypedBase" BaseType="ua:Structure">
|
|
<opc:Fields>
|
|
<opc:Field Name="Name" DataType="ua:String" />
|
|
<opc:Field Name="Payload" DataType="PayloadStruct" AllowSubTypes="true" />
|
|
</opc:Fields>
|
|
</opc:DataType>
|
|
<opc:DataType SymbolicName="DerivedWithFields" BaseType="SubtypedBase">
|
|
<opc:Fields>
|
|
<opc:Field Name="Count" DataType="ua:Int32" />
|
|
</opc:Fields>
|
|
</opc:DataType>
|
|
<opc:DataType SymbolicName="DerivedWithoutFields" BaseType="SubtypedBase" />
|
|
</opc:ModelDesign>
|
|
""";
|
|
}
|
|
}
|