mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-18 06:31:35 +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>
272 lines
9.3 KiB
C#
272 lines
9.3 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;
|
|
|
|
namespace Opc.Ua.SourceGeneration
|
|
{
|
|
/// <summary>
|
|
/// Generates the ServerCapabilities catalog from
|
|
/// the embedded ServerCapabilities.csv design file.
|
|
/// </summary>
|
|
internal class ServerCapabilitiesGenerator : IGenerator
|
|
{
|
|
/// <summary>
|
|
/// Create the server capabilities generator.
|
|
/// </summary>
|
|
public ServerCapabilitiesGenerator(IGeneratorContext context)
|
|
{
|
|
m_context = context ?? throw new ArgumentNullException(nameof(context));
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public IEnumerable<Resource> Emit()
|
|
{
|
|
string fileName = Path.Combine(
|
|
m_context.OutputFolder,
|
|
CoreUtils.Format(
|
|
"{0}.ServerCapabilities.g.cs",
|
|
Constants.CoreNamespacePrefix));
|
|
|
|
using TextWriter writer = m_context.FileSystem.CreateTextWriter(fileName);
|
|
using var templateWriter = new TemplateWriter(writer);
|
|
var template = new Template(templateWriter, CodeTemplates.StatusCode_Attributes_File);
|
|
|
|
template.AddReplacement(Tokens.Prefix, Constants.CoreNamespacePrefix);
|
|
template.AddReplacement(Tokens.ClassName, "ServerCapability");
|
|
|
|
List<Capability> capabilities = LoadCapabilities(
|
|
BuiltInDesignFiles.ServerCapabilitiesCsv);
|
|
|
|
template.AddReplacement(
|
|
Tokens.ListOfIdentifiers,
|
|
CodeTemplates.StatusCode_Attributes_Constant,
|
|
capabilities,
|
|
WriteTemplate_CapabilityConstant);
|
|
|
|
template.AddReplacement(
|
|
Tokens.IdentifierReflection,
|
|
s_allDictionaryTemplate,
|
|
[capabilities],
|
|
WriteTemplate_AllDictionary);
|
|
|
|
template.Render();
|
|
return [fileName.AsTextFileResource()];
|
|
}
|
|
|
|
/// <summary>
|
|
/// Writes a single capability constant declaration.
|
|
/// </summary>
|
|
private bool WriteTemplate_CapabilityConstant(IWriteContext context)
|
|
{
|
|
if (context.Target is not Capability capability)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
context.Template.AddReplacement(Tokens.IdType, "string");
|
|
context.Template.AddReplacement(Tokens.SymbolicId, ToSymbol(capability.Id));
|
|
context.Template.AddReplacement(
|
|
Tokens.Identifier,
|
|
CoreUtils.Format("\"{0}\"", SourceGenerationUtils.Escape(capability.Id)));
|
|
context.Template.AddReplacement(Tokens.Description, ToSummary(capability.Description));
|
|
|
|
return context.Template.Render();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Writes the static <c>All</c> dictionary that maps every capability
|
|
/// identifier to its description.
|
|
/// </summary>
|
|
private bool WriteTemplate_AllDictionary(IWriteContext context)
|
|
{
|
|
if (context.Target is not List<Capability> capabilities)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
context.Template.AddReplacement(
|
|
Tokens.ListOfIdentifiers,
|
|
capabilities,
|
|
LoadTemplate_AllEntry);
|
|
|
|
return context.Template.Render();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Writes a single entry for the <c>All</c> dictionary initializer.
|
|
/// </summary>
|
|
private TemplateString? LoadTemplate_AllEntry(ILoadContext context)
|
|
{
|
|
if (context.Target is Capability capability)
|
|
{
|
|
context.Out.WriteLine(
|
|
"{{ \"{0}\", \"{1}\" }},",
|
|
SourceGenerationUtils.Escape(capability.Id),
|
|
SourceGenerationUtils.Escape(capability.Description));
|
|
}
|
|
return null;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Loads the (id, description) capability entries from a CSV file.
|
|
/// </summary>
|
|
private List<Capability> LoadCapabilities(string capabilitiesFile)
|
|
{
|
|
var capabilities = new List<Capability>();
|
|
|
|
using TextReader reader = m_context.FileSystem.CreateTextReader(capabilitiesFile);
|
|
while (true)
|
|
{
|
|
string? line = reader.ReadLine();
|
|
if (line == null)
|
|
{
|
|
break;
|
|
}
|
|
|
|
// strip a UTF-8 BOM if present on the first row.
|
|
if (line.Length > 0 && line[0] == '\uFEFF')
|
|
{
|
|
line = line[1..];
|
|
}
|
|
|
|
if (string.IsNullOrWhiteSpace(line))
|
|
{
|
|
continue;
|
|
}
|
|
|
|
int index = line.IndexOf(',', StringComparison.Ordinal);
|
|
if (index < 0)
|
|
{
|
|
continue;
|
|
}
|
|
|
|
string id = line[..index].Trim();
|
|
string description = line[(index + 1)..].Trim();
|
|
if (id.Length == 0)
|
|
{
|
|
continue;
|
|
}
|
|
|
|
capabilities.Add(new Capability(id, description));
|
|
}
|
|
|
|
return capabilities;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Maps a CSV id to a valid C# identifier. Ids that begin with a
|
|
/// digit (e.g., "61850") are prefixed with "Iec".
|
|
/// </summary>
|
|
private static string ToSymbol(string id)
|
|
{
|
|
if (id.Length == 0)
|
|
{
|
|
return id;
|
|
}
|
|
if (char.IsDigit(id[0]))
|
|
{
|
|
return "Iec" + id;
|
|
}
|
|
return id;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Produces a short single-line XML summary text from a description.
|
|
/// </summary>
|
|
private static string ToSummary(string description)
|
|
{
|
|
if (string.IsNullOrEmpty(description))
|
|
{
|
|
return string.Empty;
|
|
}
|
|
|
|
string text = description.Trim();
|
|
|
|
// first sentence wins, otherwise the first 80 chars.
|
|
int dot = text.IndexOf('.', StringComparison.Ordinal);
|
|
if (dot > 0)
|
|
{
|
|
text = text[..(dot + 1)];
|
|
}
|
|
else if (text.Length > 80)
|
|
{
|
|
text = text[..80];
|
|
}
|
|
|
|
return EscapeXml(text);
|
|
}
|
|
|
|
private static string EscapeXml(string value)
|
|
{
|
|
if (string.IsNullOrEmpty(value))
|
|
{
|
|
return value ?? string.Empty;
|
|
}
|
|
return value
|
|
.Replace("&", "&", StringComparison.Ordinal)
|
|
.Replace("<", "<", StringComparison.Ordinal)
|
|
.Replace(">", ">", StringComparison.Ordinal);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Inline template for the static <c>All</c> dictionary block emitted
|
|
/// in the <see cref="Tokens.IdentifierReflection"/> placeholder of
|
|
/// <see cref="CodeTemplates.StatusCode_Attributes_File"/>.
|
|
/// </summary>
|
|
private static readonly TemplateString s_allDictionaryTemplate = TemplateString.Parse(
|
|
$$"""
|
|
/// <summary>
|
|
/// All known capability identifiers keyed by their identifier.
|
|
/// </summary>
|
|
public static readonly global::System.Collections.Generic.IReadOnlyDictionary<string, string> All =
|
|
new global::System.Collections.Generic.Dictionary<string, string>
|
|
{
|
|
{{Tokens.ListOfIdentifiers}}
|
|
};
|
|
""");
|
|
|
|
private sealed class Capability
|
|
{
|
|
public Capability(string id, string description)
|
|
{
|
|
Id = id;
|
|
Description = description;
|
|
}
|
|
|
|
public string Id { get; }
|
|
public string Description { get; }
|
|
}
|
|
|
|
private readonly IGeneratorContext m_context;
|
|
}
|
|
}
|