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>
392 lines
14 KiB
C#
392 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;
|
|
using System.Collections.Generic;
|
|
using System.Xml;
|
|
using Opc.Ua.Schema.Model;
|
|
|
|
namespace Opc.Ua.SourceGeneration
|
|
{
|
|
/// <summary>
|
|
/// Resolves the effective method argument metadata used by generators.
|
|
/// </summary>
|
|
internal static class MethodDesignArgumentResolver
|
|
{
|
|
/// <summary>
|
|
/// Resolves the effective input arguments for a method design.
|
|
/// </summary>
|
|
public static Parameter[] ResolveMethodInputs(MethodDesign method)
|
|
{
|
|
return ResolveMethodArguments(method).Inputs;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Resolves the effective output arguments for a method design.
|
|
/// </summary>
|
|
public static Parameter[] ResolveMethodOutputs(MethodDesign method)
|
|
{
|
|
return ResolveMethodArguments(method).Outputs;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Resolves the effective input and output arguments for a method design.
|
|
/// </summary>
|
|
public static (Parameter[] Inputs, Parameter[] Outputs) ResolveMethodArguments(
|
|
MethodDesign method)
|
|
{
|
|
if (method == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(method));
|
|
}
|
|
|
|
MethodDesign definition = ResolveMethodDefinition(method);
|
|
Parameter[] inputs = ResolveArguments(
|
|
definition.InputArguments,
|
|
definition.MethodDeclarationNode?.InputArguments,
|
|
definition.MethodType?.InputArguments);
|
|
Parameter[] outputs = ResolveArguments(
|
|
definition.OutputArguments,
|
|
definition.MethodDeclarationNode?.OutputArguments,
|
|
definition.MethodType?.OutputArguments);
|
|
return (inputs, outputs);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Returns whether a method or one of its declaration/type links defines arguments.
|
|
/// </summary>
|
|
public static bool HasMethodArguments(MethodDesign method)
|
|
{
|
|
if (method == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(method));
|
|
}
|
|
|
|
MethodDesign definition = ResolveMethodDefinition(method);
|
|
return method.HasArguments ||
|
|
definition.HasArguments ||
|
|
HasDeclaredArguments(definition);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Returns whether the method directly declares any arguments.
|
|
/// </summary>
|
|
public static bool HasDeclaredArguments(MethodDesign method)
|
|
{
|
|
if (method == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(method));
|
|
}
|
|
|
|
return method.InputArguments is { Length: > 0 } ||
|
|
method.OutputArguments is { Length: > 0 };
|
|
}
|
|
|
|
/// <summary>
|
|
/// Resolves the method design that owns the effective method state and
|
|
/// argument metadata.
|
|
/// </summary>
|
|
public static MethodDesign ResolveMethodDefinition(MethodDesign method)
|
|
{
|
|
if (method == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(method));
|
|
}
|
|
|
|
return ResolveMethodDefinition(method, []);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Resolves the qualified identity used to name the generated method
|
|
/// state class.
|
|
/// </summary>
|
|
public static XmlQualifiedName ResolveMethodStateIdentity(MethodDesign method)
|
|
{
|
|
if (method == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(method));
|
|
}
|
|
|
|
if (method.TypeDefinition != null && method.MethodType == null)
|
|
{
|
|
return method.TypeDefinition;
|
|
}
|
|
|
|
MethodDesign definition = ResolveMethodDefinition(method);
|
|
return definition.TypeDefinition ??
|
|
definition.SymbolicName ??
|
|
definition.SymbolicId ??
|
|
method.SymbolicName ??
|
|
method.SymbolicId;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Returns whether the method state of a method is a typed class that
|
|
/// is declared by a method type, rather than the base
|
|
/// <c>MethodState</c>.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// Typed method-state classes are only generated for method type
|
|
/// declarations. A method that declares its own arguments inline,
|
|
/// without a method type or a declaration that resolves to one, has
|
|
/// no typed class; its argument properties are still generated.
|
|
/// </remarks>
|
|
public static bool HasTypedMethodState(MethodDesign method)
|
|
{
|
|
if (method == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(method));
|
|
}
|
|
|
|
if (method.TypeDefinition != null && method.MethodType == null)
|
|
{
|
|
return true;
|
|
}
|
|
|
|
MethodDesign definition = ResolveMethodDefinition(method);
|
|
if (definition.TypeDefinition != null || definition.IsMethodTypeDesign())
|
|
{
|
|
return true;
|
|
}
|
|
|
|
XmlQualifiedName identity = definition.SymbolicName ?? definition.SymbolicId;
|
|
return identity?.Name != null &&
|
|
identity.Name.EndsWith("MethodType", StringComparison.Ordinal);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Returns whether two methods have identical effective signatures.
|
|
/// </summary>
|
|
public static bool HaveSameMethodSignature(
|
|
MethodDesign first,
|
|
MethodDesign second)
|
|
{
|
|
if (first == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(first));
|
|
}
|
|
if (second == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(second));
|
|
}
|
|
|
|
return HaveSameSignature(
|
|
ResolveMethodInputs(first),
|
|
ResolveMethodOutputs(first),
|
|
ResolveMethodInputs(second),
|
|
ResolveMethodOutputs(second));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Returns whether two methods directly declare identical signatures.
|
|
/// </summary>
|
|
public static bool HaveSameDeclaredSignature(
|
|
MethodDesign first,
|
|
MethodDesign second)
|
|
{
|
|
if (first == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(first));
|
|
}
|
|
if (second == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(second));
|
|
}
|
|
|
|
return HaveSameSignature(
|
|
first.InputArguments ?? [],
|
|
first.OutputArguments ?? [],
|
|
second.InputArguments ?? [],
|
|
second.OutputArguments ?? []);
|
|
}
|
|
|
|
private static MethodDesign ResolveMethodDefinition(
|
|
MethodDesign method,
|
|
List<MethodDesign> visited)
|
|
{
|
|
if (ContainsReference(visited, method))
|
|
{
|
|
return method;
|
|
}
|
|
visited.Add(method);
|
|
|
|
bool hasDeclaredArguments = HasDeclaredArguments(method);
|
|
if (method.MethodType != null &&
|
|
DelegatesTo(method, method.MethodType, hasDeclaredArguments))
|
|
{
|
|
return ResolveMethodDefinition(method.MethodType, visited);
|
|
}
|
|
|
|
if (method.MethodDeclarationNode != null &&
|
|
!ReferenceEquals(method.MethodDeclarationNode, method) &&
|
|
DelegatesTo(method, method.MethodDeclarationNode, hasDeclaredArguments))
|
|
{
|
|
return ResolveMethodDefinition(method.MethodDeclarationNode, visited);
|
|
}
|
|
|
|
return method;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Returns whether <paramref name="method"/> takes its signature from
|
|
/// <paramref name="target"/>, which is the case when it declares no
|
|
/// arguments of its own or declares exactly the target's effective
|
|
/// signature.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// The target is resolved once here rather than through
|
|
/// <see cref="ResolveMethodInputs"/> and
|
|
/// <see cref="ResolveMethodOutputs"/>, which would each walk the target
|
|
/// chain again from scratch with their own visited list. The resolution
|
|
/// is deliberately not cached across calls: the model is still being
|
|
/// mutated while it is validated, and a generator that carried state
|
|
/// between passes would stop being deterministic.
|
|
/// </remarks>
|
|
private static bool DelegatesTo(
|
|
MethodDesign method,
|
|
MethodDesign target,
|
|
bool hasDeclaredArguments)
|
|
{
|
|
if (!hasDeclaredArguments)
|
|
{
|
|
return true;
|
|
}
|
|
|
|
MethodDesign targetDefinition = ResolveMethodDefinition(target, []);
|
|
return HaveSameSignature(
|
|
method.InputArguments ?? [],
|
|
method.OutputArguments ?? [],
|
|
targetDefinition.InputArguments ?? [],
|
|
targetDefinition.OutputArguments ?? []);
|
|
}
|
|
|
|
private static Parameter[] ResolveArguments(
|
|
Parameter[] methodArguments,
|
|
Parameter[]? declarationArguments,
|
|
Parameter[]? methodTypeArguments)
|
|
{
|
|
if (methodArguments is { Length: > 0 })
|
|
{
|
|
return methodArguments;
|
|
}
|
|
|
|
if (declarationArguments is { Length: > 0 })
|
|
{
|
|
return declarationArguments;
|
|
}
|
|
|
|
if (methodTypeArguments is { Length: > 0 })
|
|
{
|
|
return methodTypeArguments;
|
|
}
|
|
|
|
return [];
|
|
}
|
|
|
|
private static bool HaveSameSignature(
|
|
Parameter[] firstInputs,
|
|
Parameter[] firstOutputs,
|
|
Parameter[] secondInputs,
|
|
Parameter[] secondOutputs)
|
|
{
|
|
return HaveSameParameters(firstInputs, secondInputs) &&
|
|
HaveSameParameters(firstOutputs, secondOutputs);
|
|
}
|
|
|
|
private static bool HaveSameParameters(
|
|
Parameter[] first,
|
|
Parameter[] second)
|
|
{
|
|
if (first.Length != second.Length)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
for (int ii = 0; ii < first.Length; ii++)
|
|
{
|
|
Parameter left = first[ii];
|
|
Parameter right = second[ii];
|
|
if (left == null || right == null)
|
|
{
|
|
if (!ReferenceEquals(left, right))
|
|
{
|
|
return false;
|
|
}
|
|
continue;
|
|
}
|
|
|
|
if (!string.Equals(left.Name, right.Name, StringComparison.Ordinal) ||
|
|
!XmlQualifiedNameEquals(left.DataType, right.DataType) ||
|
|
left.ValueRank != right.ValueRank ||
|
|
!string.Equals(
|
|
left.ArrayDimensions,
|
|
right.ArrayDimensions,
|
|
StringComparison.Ordinal) ||
|
|
left.AllowSubTypes != right.AllowSubTypes ||
|
|
left.IsOptional != right.IsOptional)
|
|
{
|
|
return false;
|
|
}
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
private static bool XmlQualifiedNameEquals(
|
|
XmlQualifiedName first,
|
|
XmlQualifiedName second)
|
|
{
|
|
if (ReferenceEquals(first, second))
|
|
{
|
|
return true;
|
|
}
|
|
if (first == null || second == null)
|
|
{
|
|
return false;
|
|
}
|
|
return string.Equals(first.Name, second.Name, StringComparison.Ordinal) &&
|
|
string.Equals(first.Namespace, second.Namespace, StringComparison.Ordinal);
|
|
}
|
|
|
|
private static bool ContainsReference(
|
|
List<MethodDesign> methods,
|
|
MethodDesign candidate)
|
|
{
|
|
foreach (MethodDesign method in methods)
|
|
{
|
|
if (ReferenceEquals(method, candidate))
|
|
{
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
}
|
|
}
|