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>
379 lines
14 KiB
C#
379 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.Concurrent;
|
|
using System.Diagnostics;
|
|
using System.Globalization;
|
|
using System.Text;
|
|
using Microsoft.Extensions.Logging;
|
|
using NUnit.Framework;
|
|
|
|
namespace Opc.Ua.Tests
|
|
{
|
|
public sealed class TelemetryParameterizable
|
|
{
|
|
public static TelemetryParameterizable<T> Create<T>(Func<ITelemetryContext, T> factory)
|
|
{
|
|
return new TelemetryParameterizable<T>(factory);
|
|
}
|
|
}
|
|
|
|
public sealed class TelemetryParameterizable<T>
|
|
{
|
|
internal TelemetryParameterizable(Func<ITelemetryContext, T> factory)
|
|
{
|
|
m_factory = factory ?? throw new ArgumentNullException(nameof(factory));
|
|
}
|
|
|
|
public T Create(ITelemetryContext telemetry)
|
|
{
|
|
return m_factory(telemetry);
|
|
}
|
|
|
|
private readonly Func<ITelemetryContext, T> m_factory;
|
|
}
|
|
|
|
public sealed class NUnitTelemetryContext : TelemetryContextBase
|
|
{
|
|
/// <summary>
|
|
/// Create telemetry context
|
|
/// </summary>
|
|
private NUnitTelemetryContext(ILoggerFactory loggerFactory)
|
|
: base(loggerFactory)
|
|
{
|
|
}
|
|
|
|
/// <summary>
|
|
/// Use the test context output
|
|
/// </summary>
|
|
/// <returns></returns>
|
|
public static ITelemetryContext Create(
|
|
bool isServer = false,
|
|
LogLevel logLevel = LogLevel.Debug)
|
|
{
|
|
string context = !isServer ? "TEST" : "SERVER";
|
|
using var provider = new NUnitLoggerProvider(context, logLevel);
|
|
#pragma warning disable CA2000 // ownership transfers to NUnitTelemetryContext via TelemetryContextBase
|
|
ILoggerFactory factory = Microsoft.Extensions.Logging.LoggerFactory
|
|
.Create(builder => builder.AddProvider(provider));
|
|
#pragma warning restore CA2000
|
|
try
|
|
{
|
|
var result = new NUnitTelemetryContext(factory);
|
|
factory = null!; // ownership transferred
|
|
return result;
|
|
}
|
|
finally
|
|
{
|
|
factory?.Dispose();
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Use the benchmark log output
|
|
/// </summary>
|
|
/// <returns></returns>
|
|
public static ITelemetryContext CreateForBenchmarks(
|
|
LogLevel logLevel = LogLevel.Information)
|
|
{
|
|
using var provider = new BenchmarkDotNetProvider(logLevel);
|
|
#pragma warning disable CA2000 // ownership transfers to NUnitTelemetryContext via TelemetryContextBase
|
|
ILoggerFactory factory = Microsoft.Extensions.Logging.LoggerFactory
|
|
.Create(builder => builder.AddProvider(provider));
|
|
#pragma warning restore CA2000
|
|
try
|
|
{
|
|
var result = new NUnitTelemetryContext(factory);
|
|
factory = null!; // ownership transferred
|
|
return result;
|
|
}
|
|
finally
|
|
{
|
|
factory?.Dispose();
|
|
}
|
|
}
|
|
|
|
[ProviderAlias("BenchmarkDotNet")]
|
|
internal sealed class BenchmarkDotNetProvider : ILoggerProvider
|
|
{
|
|
public BenchmarkDotNetProvider(LogLevel logLevel)
|
|
{
|
|
m_logLevel = logLevel;
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public ILogger CreateLogger(string categoryName)
|
|
{
|
|
return m_loggers.GetOrAdd(categoryName, name => new Logger(m_logLevel));
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public void Dispose()
|
|
{
|
|
}
|
|
|
|
private sealed class Logger : ILogger, IDisposable
|
|
{
|
|
public Logger(
|
|
LogLevel logLevel,
|
|
BenchmarkDotNet.Loggers.ILogger? logger = null)
|
|
{
|
|
MinimumLogLevel = logLevel;
|
|
m_logger = logger ??
|
|
BenchmarkDotNet.Loggers.ConsoleLogger.Default;
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public LogLevel MinimumLogLevel { get; set; } = LogLevel.Information;
|
|
|
|
/// <inheritdoc/>
|
|
public IDisposable BeginScope<TState>(TState state) where TState : notnull
|
|
{
|
|
return this;
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public void Dispose()
|
|
{
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public bool IsEnabled(LogLevel logLevel)
|
|
{
|
|
return logLevel >= MinimumLogLevel;
|
|
}
|
|
|
|
public void Log<TState>(
|
|
LogLevel logLevel,
|
|
EventId eventId,
|
|
TState state,
|
|
Exception? exception,
|
|
Func<TState, Exception, string> formatter)
|
|
{
|
|
if (logLevel < MinimumLogLevel)
|
|
{
|
|
return;
|
|
}
|
|
try
|
|
{
|
|
StringBuilder sb = new StringBuilder()
|
|
.AppendFormat(
|
|
CultureInfo.InvariantCulture,
|
|
"{0:yy-MM-dd HH:mm:ss.fff}: ",
|
|
DateTime.UtcNow)
|
|
.Append(formatter(state, exception!));
|
|
if (exception != null)
|
|
{
|
|
sb
|
|
.AppendLine()
|
|
.AppendException(exception, "\t");
|
|
}
|
|
m_logger.WriteLine(logLevel switch
|
|
{
|
|
LogLevel.Information => BenchmarkDotNet.Loggers.LogKind.Info,
|
|
LogLevel.Warning => BenchmarkDotNet.Loggers.LogKind.Warning,
|
|
LogLevel.Error or
|
|
LogLevel.Critical => BenchmarkDotNet.Loggers.LogKind.Error,
|
|
LogLevel.Trace or
|
|
LogLevel.Debug or
|
|
LogLevel.None => BenchmarkDotNet.Loggers.LogKind.Default,
|
|
_ => throw new ArgumentException("Unknown log level", nameof(logLevel))
|
|
},
|
|
sb.ToString());
|
|
}
|
|
catch
|
|
{
|
|
// intentionally ignored
|
|
}
|
|
}
|
|
|
|
private readonly BenchmarkDotNet.Loggers.ILogger m_logger;
|
|
}
|
|
|
|
private readonly ConcurrentDictionary<string, Logger> m_loggers =
|
|
new(StringComparer.OrdinalIgnoreCase);
|
|
|
|
private readonly LogLevel m_logLevel;
|
|
}
|
|
|
|
[ProviderAlias("NUnit")]
|
|
internal sealed class NUnitLoggerProvider : ILoggerProvider
|
|
{
|
|
/// <summary>
|
|
/// Create provider for context
|
|
/// </summary>
|
|
/// <param name="context"></param>
|
|
public NUnitLoggerProvider(string context, LogLevel logLevel)
|
|
{
|
|
m_logLevel = logLevel;
|
|
m_context = context;
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public ILogger CreateLogger(string categoryName)
|
|
{
|
|
return m_loggers.GetOrAdd(categoryName,
|
|
name => new Logger(m_context, categoryName, m_logLevel));
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public void Dispose()
|
|
{
|
|
}
|
|
|
|
private sealed class Logger : ILogger, IDisposable
|
|
{
|
|
public Logger(string context, string categoryName, LogLevel logLevel)
|
|
{
|
|
MinimumLogLevel = logLevel;
|
|
m_context = context;
|
|
m_categoryName = categoryName;
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public LogLevel MinimumLogLevel { get; set; }
|
|
|
|
/// <inheritdoc/>
|
|
public IDisposable BeginScope<TState>(TState state) where TState : notnull
|
|
{
|
|
return this;
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public void Dispose()
|
|
{
|
|
// nothing to dispose
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public bool IsEnabled(LogLevel logLevel)
|
|
{
|
|
if (logLevel < MinimumLogLevel)
|
|
{
|
|
return false;
|
|
}
|
|
switch (logLevel)
|
|
{
|
|
case LogLevel.Trace:
|
|
case LogLevel.Debug:
|
|
case LogLevel.Information:
|
|
case LogLevel.Warning:
|
|
return TestContext.Progress != null;
|
|
case LogLevel.Error:
|
|
case LogLevel.Critical:
|
|
return TestContext.Error != null;
|
|
default:
|
|
return false;
|
|
}
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public void Log<TState>(
|
|
LogLevel logLevel,
|
|
EventId eventId,
|
|
TState state,
|
|
Exception? exception,
|
|
Func<TState, Exception, string> formatter)
|
|
{
|
|
if (logLevel < MinimumLogLevel)
|
|
{
|
|
return;
|
|
}
|
|
try
|
|
{
|
|
// Add the info to the test log if on current context
|
|
StringBuilder sb = new StringBuilder()
|
|
.AppendFormat(
|
|
CultureInfo.InvariantCulture,
|
|
"{0:HH:mm:ss.fff} ",
|
|
DateTime.UtcNow)
|
|
.Append('[')
|
|
.Append(m_categoryName)
|
|
.Append(']')
|
|
.Append(' ')
|
|
.Append(formatter(state, exception!));
|
|
if (exception != null)
|
|
{
|
|
sb
|
|
.AppendLine()
|
|
.AppendException(exception, "\t");
|
|
}
|
|
string logRecord = sb.ToString();
|
|
TestContext.Out.WriteLine(logRecord);
|
|
|
|
// Also write to progress/error which captures all output not just test
|
|
logRecord = sb
|
|
.Clear()
|
|
.Append(TestContext.CurrentContext?.Test?.DisplayName ?? string.Empty)
|
|
.Append(' ')
|
|
.AppendLine(TestContext.CurrentContext?.Test?.Name ?? string.Empty)
|
|
.Append('\t')
|
|
.Append(m_context)
|
|
.Append(' ')
|
|
.Append(logRecord)
|
|
.ToString();
|
|
switch (logLevel)
|
|
{
|
|
case LogLevel.Trace:
|
|
case LogLevel.Debug:
|
|
case LogLevel.Information:
|
|
case LogLevel.Warning:
|
|
TestContext.Progress.WriteLine(logRecord);
|
|
break;
|
|
case LogLevel.Error:
|
|
case LogLevel.Critical:
|
|
TestContext.Error.WriteLine(logRecord);
|
|
break;
|
|
case LogLevel.None:
|
|
return;
|
|
default:
|
|
Debug.Fail($"Bad log level {logLevel}");
|
|
break;
|
|
}
|
|
}
|
|
catch
|
|
{
|
|
// intentionally ignored
|
|
}
|
|
}
|
|
|
|
private readonly string m_context;
|
|
private readonly string m_categoryName;
|
|
}
|
|
|
|
private readonly ConcurrentDictionary<string, Logger> m_loggers =
|
|
new(StringComparer.OrdinalIgnoreCase);
|
|
|
|
private readonly LogLevel m_logLevel;
|
|
private readonly string m_context;
|
|
}
|
|
}
|
|
}
|