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>
205 lines
8.4 KiB
C#
205 lines
8.4 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.Collections.Generic;
|
|
using Moq;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Schema.Model;
|
|
|
|
namespace Opc.Ua.SourceGeneration.Generator.Tests
|
|
{
|
|
/// <summary>
|
|
/// Tests for <see cref="Generators.OverrideDependencyPrefixes"/> — the
|
|
/// cross-namespace prefix override step used by the source generator
|
|
/// to align dependency type references with the C# prefix published
|
|
/// by referenced assemblies' [ModelDependencyAttribute] entries.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("Api")]
|
|
[SetCulture("en-us")]
|
|
[SetUICulture("en-us")]
|
|
[Parallelizable]
|
|
public class CrossNamespacePrefixTests
|
|
{
|
|
private const string TargetUri = "http://example.org/UA/Target/";
|
|
private const string DependencyUri = "http://opcfoundation.org/UA/DI/";
|
|
private const string MachineryUri = "http://opcfoundation.org/UA/Machinery/";
|
|
|
|
/// <summary>
|
|
/// When the loaded ModelDesign declares a dependency namespace with
|
|
/// the auto-generated prefix (e.g. <c>Opc.Ua.DI</c>) but a
|
|
/// referenced assembly publishes that model under a different C#
|
|
/// prefix (e.g. <c>Opc.Ua.Di</c>), the override rewrites the
|
|
/// dependency namespace prefix to match.
|
|
/// </summary>
|
|
[Test]
|
|
public void ModelWithDifferentPrefixAndXmlPrefix_EmitsCSharpPrefix()
|
|
{
|
|
var target = new Namespace { Value = TargetUri, Prefix = "Opc.Ua.Target" };
|
|
var dep = new Namespace
|
|
{
|
|
Value = DependencyUri,
|
|
Prefix = "Opc.Ua.DI",
|
|
XmlPrefix = "DI"
|
|
};
|
|
IModelDesign md = BuildDesign(target, [target, dep]);
|
|
var referenced = new Dictionary<string, ModelDependencyReference>
|
|
{
|
|
[DependencyUri] = new ModelDependencyReference(
|
|
"Opc.Ua.Di", DependencyUri, "Opc.Ua.Di", null!, null!)
|
|
};
|
|
|
|
Generators.OverrideDependencyPrefixes(md, referenced);
|
|
|
|
Assert.That(dep.Prefix, Is.EqualTo("Opc.Ua.Di"));
|
|
// XmlPrefix is untouched — only the C# Prefix is rewritten.
|
|
Assert.That(dep.XmlPrefix, Is.EqualTo("DI"));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Looking up by URI (not by XmlPrefix or auto-generated name)
|
|
/// matches the entry in <see cref="ModelDependencyReference"/>.
|
|
/// </summary>
|
|
[Test]
|
|
public void CrossModelReference_ResolvesViaUriLookup()
|
|
{
|
|
var target = new Namespace { Value = TargetUri, Prefix = "Opc.Ua.Target" };
|
|
var dep = new Namespace { Value = DependencyUri, Prefix = "wrong" };
|
|
IModelDesign md = BuildDesign(target, [target, dep]);
|
|
var referenced = new Dictionary<string, ModelDependencyReference>
|
|
{
|
|
[DependencyUri] = new ModelDependencyReference(
|
|
"Opc.Ua.Di", DependencyUri, "Opc.Ua.Di", null!, null!)
|
|
};
|
|
|
|
Generators.OverrideDependencyPrefixes(md, referenced);
|
|
|
|
Assert.That(dep.Prefix, Is.EqualTo("Opc.Ua.Di"));
|
|
}
|
|
|
|
/// <summary>
|
|
/// A namespace URI that is not in the referenced-models map is
|
|
/// left untouched.
|
|
/// </summary>
|
|
[Test]
|
|
public void UnknownNamespaceUri_NotRewritten()
|
|
{
|
|
var target = new Namespace { Value = TargetUri, Prefix = "Opc.Ua.Target" };
|
|
var dep = new Namespace
|
|
{
|
|
Value = "http://unknown.example.org/X/",
|
|
Prefix = "Original"
|
|
};
|
|
IModelDesign md = BuildDesign(target, [target, dep]);
|
|
var referenced = new Dictionary<string, ModelDependencyReference>
|
|
{
|
|
[DependencyUri] = new ModelDependencyReference(
|
|
"Opc.Ua.Di", DependencyUri, "Opc.Ua.Di", null!, null!)
|
|
};
|
|
|
|
Generators.OverrideDependencyPrefixes(md, referenced);
|
|
|
|
Assert.That(dep.Prefix, Is.EqualTo("Original"));
|
|
}
|
|
|
|
/// <summary>
|
|
/// When multiple namespaces match referenced-models entries, all
|
|
/// of them are rewritten.
|
|
/// </summary>
|
|
[Test]
|
|
public void MultipleNamespaceImports_AllMapCorrectly()
|
|
{
|
|
var target = new Namespace { Value = TargetUri, Prefix = "Opc.Ua.Target" };
|
|
var di = new Namespace { Value = DependencyUri, Prefix = "Opc.Ua.DI" };
|
|
var machinery = new Namespace { Value = MachineryUri, Prefix = "Opc.Ua.Machinery" };
|
|
IModelDesign md = BuildDesign(target, [target, di, machinery]);
|
|
var referenced = new Dictionary<string, ModelDependencyReference>
|
|
{
|
|
[DependencyUri] = new ModelDependencyReference(
|
|
"Opc.Ua.Di", DependencyUri, "Opc.Ua.Di", null!, null!),
|
|
[MachineryUri] = new ModelDependencyReference(
|
|
"Acme.Machinery", MachineryUri, "Acme.Machinery", null!, null!)
|
|
};
|
|
|
|
Generators.OverrideDependencyPrefixes(md, referenced);
|
|
|
|
Assert.That(di.Prefix, Is.EqualTo("Opc.Ua.Di"));
|
|
Assert.That(machinery.Prefix, Is.EqualTo("Acme.Machinery"));
|
|
}
|
|
|
|
/// <summary>
|
|
/// The target namespace itself is never rewritten, even if a
|
|
/// referenced-models entry happens to claim the same URI.
|
|
/// Otherwise the generator would emit references into someone
|
|
/// else's assembly.
|
|
/// </summary>
|
|
[Test]
|
|
public void TargetNamespace_NeverRewritten()
|
|
{
|
|
var target = new Namespace { Value = TargetUri, Prefix = "Opc.Ua.Target" };
|
|
IModelDesign md = BuildDesign(target, [target]);
|
|
var referenced = new Dictionary<string, ModelDependencyReference>
|
|
{
|
|
[TargetUri] = new ModelDependencyReference(
|
|
"Foreign.Asm", TargetUri, "Foreign.Target", null!, null!)
|
|
};
|
|
|
|
Generators.OverrideDependencyPrefixes(md, referenced);
|
|
|
|
Assert.That(target.Prefix, Is.EqualTo("Opc.Ua.Target"));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Null inputs do not throw.
|
|
/// </summary>
|
|
[Test]
|
|
public void NullInputs_NoThrow()
|
|
{
|
|
// Null modelDesign
|
|
Assert.DoesNotThrow(() =>
|
|
Generators.OverrideDependencyPrefixes(
|
|
null!, new Dictionary<string, ModelDependencyReference>()));
|
|
|
|
// Null referenced map
|
|
var target = new Namespace { Value = TargetUri, Prefix = "Opc.Ua.Target" };
|
|
IModelDesign md = BuildDesign(target, [target]);
|
|
Assert.DoesNotThrow(() =>
|
|
Generators.OverrideDependencyPrefixes(md, null!));
|
|
}
|
|
|
|
private static IModelDesign BuildDesign(Namespace target, Namespace[] all)
|
|
{
|
|
var mock = new Mock<IModelDesign>();
|
|
mock.Setup(m => m.TargetNamespace).Returns(target);
|
|
mock.Setup(m => m.Namespaces).Returns(all);
|
|
return mock.Object;
|
|
}
|
|
}
|
|
}
|