mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-18 22:55:08 +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>
335 lines
13 KiB
C#
335 lines
13 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.Generic;
|
|
using System.IO;
|
|
using System.Linq;
|
|
using Opc.Ua.Schema.Model;
|
|
|
|
namespace Opc.Ua.SourceGeneration
|
|
{
|
|
/// <summary>
|
|
/// Model options
|
|
/// </summary>
|
|
public sealed record class DesignFileOptions
|
|
{
|
|
/// <summary>
|
|
/// -version [v104, v105]
|
|
/// </summary>
|
|
public string? Version { get; init; }
|
|
|
|
/// <summary>
|
|
/// -id [start id]
|
|
/// </summary>
|
|
public uint StartId { get; init; }
|
|
|
|
/// <summary>
|
|
/// -mv [model version]
|
|
/// </summary>
|
|
public string? ModelVersion { get; init; }
|
|
|
|
/// <summary>
|
|
/// -pd [publication date]
|
|
/// </summary>
|
|
public string? ModelPublicationDate { get; init; }
|
|
|
|
/// <summary>
|
|
/// -rc
|
|
/// </summary>
|
|
public bool ReleaseCandidate { get; init; } = true;
|
|
|
|
/// <summary>
|
|
/// When <c>true</c>, also emits a <c>{Namespace}NodeManager</c>
|
|
/// (a <c>partial class</c> deriving from
|
|
/// <c>Opc.Ua.Server.AsyncCustomNodeManager</c>) and a matching
|
|
/// <c>{Namespace}NodeManagerFactory</c> implementing
|
|
/// <c>Opc.Ua.Server.INodeManagerFactory</c>.
|
|
/// <para>
|
|
/// The generated manager exposes a
|
|
/// <c>partial void Configure(INodeManagerBuilder builder)</c>
|
|
/// extensibility hook that user code can implement in a sibling
|
|
/// partial to wire callbacks via the fluent
|
|
/// <c>Opc.Ua.Server.Fluent</c> API.
|
|
/// </para>
|
|
/// </summary>
|
|
public bool GenerateNodeManager { get; init; }
|
|
|
|
/// <summary>
|
|
/// Optional override for the namespace of the generated
|
|
/// <c>NodeManager</c> partial. When set, the generator emits
|
|
/// <c>partial class {NodeManagerClassName}</c> in this namespace
|
|
/// instead of using the design file <c>Prefix</c>. Used by the
|
|
/// <c>[NodeManager]</c> attribute discovery path.
|
|
/// </summary>
|
|
public string? NodeManagerNamespace { get; init; }
|
|
|
|
/// <summary>
|
|
/// Optional override for the class name of the generated
|
|
/// <c>NodeManager</c> partial. Defaults to
|
|
/// <c>{Prefix}NodeManager</c>. Used by the <c>[NodeManager]</c>
|
|
/// attribute discovery path.
|
|
/// </summary>
|
|
public string? NodeManagerClassName { get; init; }
|
|
|
|
/// <summary>
|
|
/// Whether to also emit the <c>{ClassName}Factory</c>. Defaults
|
|
/// to <c>true</c>. Set to <c>false</c> when the consumer wants
|
|
/// to author the factory by hand.
|
|
/// </summary>
|
|
public bool EmitNodeManagerFactory { get; init; } = true;
|
|
|
|
/// <summary>
|
|
/// Whether to emit the public
|
|
/// <c>(IServerInternal, ApplicationConfiguration)</c> constructor
|
|
/// on the generated <c>NodeManager</c>. Defaults to <c>true</c>.
|
|
/// Set to <c>false</c> for managers that need collaborators
|
|
/// beyond those two arguments; the <c>protected</c> constructor
|
|
/// taking the namespace URI array is emitted either way. Used by
|
|
/// the <c>[NodeManager]</c> attribute discovery path
|
|
/// (<c>GenerateDefaultConstructor</c> named argument).
|
|
/// </summary>
|
|
public bool EmitNodeManagerDefaultConstructor { get; init; } = true;
|
|
|
|
/// <summary>
|
|
/// Additional namespace URIs (beyond the model namespace) that
|
|
/// the generated <c>NodeManager</c> constructor reports to the
|
|
/// base node manager and the generated factory advertises via
|
|
/// <c>NamespacesUris</c>. Used by the <c>[NodeManager]</c>
|
|
/// attribute discovery path
|
|
/// (<c>AdditionalNamespaceUris</c> named argument).
|
|
/// </summary>
|
|
public IReadOnlyList<string>? NodeManagerAdditionalNamespaceUris { get; init; }
|
|
}
|
|
|
|
/// <summary>
|
|
/// Collection of design files and options
|
|
/// </summary>
|
|
public sealed record class DesignFileCollection
|
|
{
|
|
/// <summary>
|
|
/// Design files to generate code for. Typically a single file.
|
|
/// </summary>
|
|
public IReadOnlyList<string> Targets { get; init; } = [];
|
|
|
|
/// <summary>
|
|
/// Design files referenced by <see cref="Targets"/> but not
|
|
/// generated. They provide node resolution only (e.g. when a
|
|
/// target imports types from another companion specification).
|
|
/// </summary>
|
|
public IReadOnlyList<string> Dependencies { get; init; } = [];
|
|
|
|
/// <summary>
|
|
/// Optional identifier file if not same name and side
|
|
/// by side with design files
|
|
/// </summary>
|
|
public string? IdentifierFilePath { get; init; }
|
|
|
|
/// <summary>
|
|
/// Design file options
|
|
/// </summary>
|
|
public DesignFileOptions? Options { get; init; }
|
|
}
|
|
|
|
/// <summary>
|
|
/// Validate model design
|
|
/// </summary>
|
|
internal static class DesignFileExtensions
|
|
{
|
|
/// <summary>
|
|
/// Gets design file groups for processing. Each target is emitted as an
|
|
/// independent model and is paired with an adjacent identifier file that
|
|
/// has the same base name. Every other target remains available as a
|
|
/// dependency so cross-model references resolve in either direction.
|
|
/// </summary>
|
|
/// <exception cref="ArgumentNullException"><paramref name="collection"/>
|
|
/// is <c>null</c>.</exception>
|
|
public static IEnumerable<DesignFileCollection> Group(
|
|
this DesignFileCollection collection,
|
|
List<string>? identifierFiles = null)
|
|
{
|
|
if (collection is null)
|
|
{
|
|
throw new ArgumentNullException(nameof(collection));
|
|
}
|
|
IReadOnlyList<string> idFiles = identifierFiles ?? [];
|
|
IReadOnlyList<string> dependencies = collection.Dependencies ?? [];
|
|
IReadOnlyList<string> targets = collection.Targets;
|
|
return collection.Targets
|
|
.Select(target => new DesignFileCollection
|
|
{
|
|
Targets = [target],
|
|
Dependencies = [.. dependencies
|
|
.Concat(targets)
|
|
.Where(path => !string.Equals(path, target, StringComparison.Ordinal))
|
|
.Distinct(StringComparer.Ordinal)],
|
|
IdentifierFilePath = ResolveIdentifierFile(
|
|
target,
|
|
idFiles,
|
|
collection.IdentifierFilePath!,
|
|
IsSoleTargetInDirectory(target, targets)),
|
|
Options = collection.Options
|
|
});
|
|
}
|
|
|
|
private static string ResolveIdentifierFile(
|
|
string target,
|
|
IReadOnlyList<string> identifierFiles,
|
|
string fallback,
|
|
bool useSoleAdjacentFallback)
|
|
{
|
|
string targetDirectory = Path.GetDirectoryName(target) ?? string.Empty;
|
|
string targetName = Path.GetFileNameWithoutExtension(target);
|
|
string? basenameMatch = identifierFiles.FirstOrDefault(path =>
|
|
string.Equals(
|
|
Path.GetDirectoryName(path) ?? string.Empty,
|
|
targetDirectory,
|
|
StringComparison.Ordinal) &&
|
|
string.Equals(
|
|
Path.GetFileNameWithoutExtension(path),
|
|
targetName,
|
|
StringComparison.Ordinal) &&
|
|
string.Equals(
|
|
Path.GetExtension(path),
|
|
".csv",
|
|
StringComparison.OrdinalIgnoreCase));
|
|
if (basenameMatch != null)
|
|
{
|
|
return basenameMatch;
|
|
}
|
|
if (useSoleAdjacentFallback)
|
|
{
|
|
string[] adjacentFiles = [.. identifierFiles.Where(path =>
|
|
string.Equals(
|
|
Path.GetDirectoryName(path) ?? string.Empty,
|
|
targetDirectory,
|
|
StringComparison.Ordinal))];
|
|
if (adjacentFiles.Length == 1)
|
|
{
|
|
return adjacentFiles[0];
|
|
}
|
|
}
|
|
return fallback;
|
|
}
|
|
|
|
private static bool IsSoleTargetInDirectory(
|
|
string target,
|
|
IReadOnlyList<string> targets)
|
|
{
|
|
string targetDirectory = Path.GetDirectoryName(target) ?? string.Empty;
|
|
bool foundTarget = false;
|
|
foreach (string path in targets)
|
|
{
|
|
if (!string.Equals(
|
|
Path.GetDirectoryName(path) ?? string.Empty,
|
|
targetDirectory,
|
|
StringComparison.Ordinal))
|
|
{
|
|
continue;
|
|
}
|
|
if (foundTarget)
|
|
{
|
|
return false;
|
|
}
|
|
foundTarget = true;
|
|
}
|
|
return foundTarget;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Validates the model design files
|
|
/// </summary>
|
|
public static IModelDesign OpenModelDesign(
|
|
this IFileSystem fileSystem,
|
|
DesignFileCollection designFiles,
|
|
IReadOnlyList<string> exclusions,
|
|
ITelemetryContext telemetry,
|
|
bool useAllowSubtypes = true)
|
|
{
|
|
return OpenModelDesign(
|
|
fileSystem,
|
|
designFiles,
|
|
exclusions,
|
|
telemetry,
|
|
useAllowSubtypes,
|
|
referencedDependencies: null);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Validates the model design files, optionally importing
|
|
/// per-namespace model dependency payloads from referenced
|
|
/// assemblies before validation. The payloads pre-populate the
|
|
/// validator's node table so downstream models can resolve
|
|
/// upstream types without an explicit <c>AdditionalFiles</c>
|
|
/// entry for them.
|
|
/// </summary>
|
|
public static IModelDesign OpenModelDesign(
|
|
this IFileSystem fileSystem,
|
|
DesignFileCollection designFiles,
|
|
IReadOnlyList<string> exclusions,
|
|
ITelemetryContext telemetry,
|
|
bool useAllowSubtypes,
|
|
IReadOnlyDictionary<string, Dependency.ModelDependencyV1>? referencedDependencies)
|
|
{
|
|
DesignFileOptions options = designFiles.Options ?? new DesignFileOptions();
|
|
var validator = new ModelDesignValidator(
|
|
fileSystem,
|
|
options.StartId,
|
|
exclusions,
|
|
telemetry,
|
|
SpecificationVersion.V105)
|
|
{
|
|
UseAllowSubtypes = useAllowSubtypes,
|
|
ReleaseCandidate = options.ReleaseCandidate,
|
|
ModelVersion = options.ModelVersion,
|
|
ModelPublicationDate = options.ModelPublicationDate
|
|
};
|
|
|
|
if (referencedDependencies != null)
|
|
{
|
|
foreach (KeyValuePair<string, Dependency.ModelDependencyV1> entry in referencedDependencies)
|
|
{
|
|
if (entry.Value == null)
|
|
{
|
|
continue;
|
|
}
|
|
validator.ImportDependency(entry.Value, prefix: null, name: null);
|
|
}
|
|
}
|
|
|
|
string? identifierFilePath = designFiles.IdentifierFilePath;
|
|
validator.Validate(
|
|
designFiles.Targets,
|
|
designFiles.Dependencies ?? [],
|
|
identifierFilePath!);
|
|
return validator;
|
|
}
|
|
}
|
|
}
|