mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-20 00:31:32 +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>
223 lines
8.7 KiB
C#
223 lines
8.7 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.Collections.Generic;
|
|
using System.Reflection;
|
|
|
|
namespace Opc.Ua.SourceGeneration
|
|
{
|
|
/// <summary>
|
|
/// Templating engine
|
|
/// </summary>
|
|
internal sealed class Template
|
|
{
|
|
/// <summary>
|
|
/// Create template
|
|
/// </summary>
|
|
public Template(TemplateWriter writer, TemplateString templateString)
|
|
: this(writer, templateString, null)
|
|
{
|
|
}
|
|
|
|
/// <summary>
|
|
/// Create template
|
|
/// </summary>
|
|
private Template(
|
|
TemplateWriter writer,
|
|
TemplateString templateString,
|
|
Template? parent)
|
|
{
|
|
m_replacements = [];
|
|
m_templateString = templateString;
|
|
m_outerTemplate = parent;
|
|
m_writer = writer;
|
|
m_replacements.Add(Tokens.CodeHeader, CodeTemplates.CodeHeader);
|
|
m_replacements.Add(Tokens.Tool,
|
|
Assembly.GetExecutingAssembly().GetName().Name);
|
|
m_replacements.Add(
|
|
Tokens.Version,
|
|
#if FULL_VERSION
|
|
CoreUtils.Format("{0}.{1}", s_softwareVersion, s_buildVersion));
|
|
#else
|
|
s_softwareVersion);
|
|
#endif
|
|
}
|
|
|
|
/// <summary>
|
|
/// Adds a replacement value for a token.
|
|
/// </summary>
|
|
/// <typeparam name="T"></typeparam>
|
|
public void AddReplacement<T>(string token, T replacement)
|
|
{
|
|
m_replacements[token] = CoreUtils.Format("{0}", replacement);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Adds a replacement value for a token.
|
|
/// </summary>
|
|
public void AddReplacement(string token, bool replacement)
|
|
{
|
|
m_replacements[token] = replacement ? "true" : "false";
|
|
}
|
|
|
|
/// <summary>
|
|
/// Adds a replacement value for a token.
|
|
/// </summary>
|
|
public void AddReplacement(string token, string? replacement)
|
|
{
|
|
m_replacements[token] = replacement;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Add template definition for a token.
|
|
/// </summary>
|
|
public void AddReplacement(string token, TemplateDefinition templateDefinition)
|
|
{
|
|
m_replacements[token] = templateDefinition;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Render the template
|
|
/// </summary>
|
|
public bool Render()
|
|
{
|
|
m_writer.TrimLineBreak(2);
|
|
bool written = false;
|
|
ParsedTemplateString parsed = m_templateString.ParsedTemplate;
|
|
for (int i = 0; i < parsed.Operations.Count; i++)
|
|
{
|
|
ParsedTemplateString.Op op = parsed.Operations[i];
|
|
switch (op.Type)
|
|
{
|
|
case ParsedTemplateString.OpType.Token:
|
|
// check if a template substitution is required.
|
|
if (!TryGetReplacement(op.Item, out object? replacement) ||
|
|
replacement == null)
|
|
{
|
|
m_writer.TrimLineBreak(0);
|
|
break;
|
|
}
|
|
if (replacement is not TemplateDefinition definition)
|
|
{
|
|
m_writer.Write(replacement.ToString());
|
|
written = true;
|
|
break;
|
|
}
|
|
if (definition.Targets == null ||
|
|
definition.Targets.Count == 0)
|
|
{
|
|
m_writer.TrimLineBreak(0);
|
|
break;
|
|
}
|
|
written = false;
|
|
var context = new TemplateContext(m_writer, op.Item, definition.TemplateString!);
|
|
m_writer.PushIndentChars(op.Offset);
|
|
bool writeNewLineBetweenTargets = false;
|
|
for (int j = 0; j < definition.Targets.Count; j++)
|
|
{
|
|
context.Target = definition.Targets[j];
|
|
|
|
// get the template path name.
|
|
TemplateString? templateString = definition.Load(context);
|
|
// skip item if no template specified.
|
|
if (templateString == null)
|
|
{
|
|
m_writer.TrimLineBreak(writeNewLineBetweenTargets ? 0 : 1);
|
|
context.Index++;
|
|
continue;
|
|
}
|
|
|
|
// begin new line between multi line items if needed.
|
|
if (writeNewLineBetweenTargets)
|
|
{
|
|
m_writer.WriteNewLine(2);
|
|
m_writer.WriteNewLine(2);
|
|
}
|
|
|
|
// load the template.
|
|
var template = new Template(
|
|
m_writer,
|
|
templateString,
|
|
this);
|
|
if (definition.Render(context with { Template = template }))
|
|
{
|
|
writeNewLineBetweenTargets =
|
|
templateString.ParsedTemplate.IsMultiLine;
|
|
written = true;
|
|
}
|
|
else
|
|
{
|
|
writeNewLineBetweenTargets = false;
|
|
}
|
|
context.Index++;
|
|
}
|
|
m_writer.PopIndentation();
|
|
break;
|
|
case ParsedTemplateString.OpType.LineBreak:
|
|
m_writer.WriteNewLine(int.MaxValue);
|
|
written = true;
|
|
break;
|
|
// Not a token, e.g. a date time or value that was appended
|
|
case ParsedTemplateString.OpType.Value:
|
|
case ParsedTemplateString.OpType.Literal:
|
|
m_writer.Write(op.Item);
|
|
written = true;
|
|
break;
|
|
case ParsedTemplateString.OpType.WhiteSpace:
|
|
m_writer.WriteWhiteSpace(op.Item.Length);
|
|
break;
|
|
}
|
|
}
|
|
return written;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Try get replacement and fall back to outer scope
|
|
/// </summary>
|
|
private bool TryGetReplacement(string token, out object? replacement)
|
|
{
|
|
if (!m_replacements.TryGetValue(token, out replacement))
|
|
{
|
|
return m_outerTemplate != null &&
|
|
m_outerTemplate.TryGetReplacement(token, out replacement);
|
|
}
|
|
return true;
|
|
}
|
|
|
|
private static readonly string s_softwareVersion = CoreUtils.GetAssemblySoftwareVersion();
|
|
#if FULL_VERSION
|
|
private static readonly string s_buildVersion = CoreUtils.GetAssemblyBuildNumber();
|
|
#endif
|
|
private readonly TemplateString m_templateString;
|
|
private readonly Template? m_outerTemplate;
|
|
private readonly TemplateWriter m_writer;
|
|
private readonly Dictionary<string, object?> m_replacements;
|
|
}
|
|
}
|