mirror of
https://github.com/GeWuYou/GFramework.git
synced 2026-05-07 00:39:00 +08:00
feat(generator): 添加运行时发现处理器接口的日志名称记录功能
- 在 HandlerCandidateAnalysis 结构中新增 RuntimeDiscoveredHandlerInterfaceLogNames 字段 - 为运行时发现的处理器接口创建日志名称收集器并存储显示名称 - 修改构造函数和属性以支持新的日志名称数组字段 - 更新相等性比较逻辑以包含运行时发现接口日志名称的比较 - 在生成的代码中添加注释显示剩余的运行时接口发现目标 - 更新单元测试验证生成的注释内容是否正确包含接口名称
This commit is contained in:
parent
e96623b7f5
commit
823be21779
@ -932,6 +932,10 @@ public class CqrsHandlerRegistryGeneratorTests
|
|||||||
generatedSource,
|
generatedSource,
|
||||||
Does.Contain(
|
Does.Contain(
|
||||||
"var knownServiceTypes0 = new global::System.Collections.Generic.HashSet<global::System.Type>();"));
|
"var knownServiceTypes0 = new global::System.Collections.Generic.HashSet<global::System.Type>();"));
|
||||||
|
Assert.That(
|
||||||
|
generatedSource,
|
||||||
|
Does.Contain(
|
||||||
|
"// Remaining runtime interface discovery target: GFramework.Cqrs.Abstractions.Cqrs.IRequestHandler<Dep.VisibilityScope.ProtectedRequest, Dep.VisibilityScope.ProtectedResponse[]>"));
|
||||||
Assert.That(
|
Assert.That(
|
||||||
generatedSource,
|
generatedSource,
|
||||||
Does.Contain(
|
Does.Contain(
|
||||||
|
|||||||
@ -92,6 +92,8 @@ public sealed class CqrsHandlerRegistryGenerator : IIncrementalGenerator
|
|||||||
ImmutableArray.CreateBuilder<ReflectedImplementationRegistrationSpec>(handlerInterfaces.Length);
|
ImmutableArray.CreateBuilder<ReflectedImplementationRegistrationSpec>(handlerInterfaces.Length);
|
||||||
var preciseReflectedRegistrations =
|
var preciseReflectedRegistrations =
|
||||||
ImmutableArray.CreateBuilder<PreciseReflectedRegistrationSpec>(handlerInterfaces.Length);
|
ImmutableArray.CreateBuilder<PreciseReflectedRegistrationSpec>(handlerInterfaces.Length);
|
||||||
|
var runtimeDiscoveredHandlerInterfaceLogNames =
|
||||||
|
ImmutableArray.CreateBuilder<string>(handlerInterfaces.Length);
|
||||||
var requiresRuntimeInterfaceDiscovery = false;
|
var requiresRuntimeInterfaceDiscovery = false;
|
||||||
foreach (var handlerInterface in handlerInterfaces)
|
foreach (var handlerInterface in handlerInterfaces)
|
||||||
{
|
{
|
||||||
@ -128,6 +130,7 @@ public sealed class CqrsHandlerRegistryGenerator : IIncrementalGenerator
|
|||||||
// 对这些边角场景保留“已知接口静态注册 + 剩余接口运行时补洞”的组合路径,
|
// 对这些边角场景保留“已知接口静态注册 + 剩余接口运行时补洞”的组合路径,
|
||||||
// 避免单个未知接口把同实现上的其它已知注册全部拖回整实现反射发现。
|
// 避免单个未知接口把同实现上的其它已知注册全部拖回整实现反射发现。
|
||||||
requiresRuntimeInterfaceDiscovery = true;
|
requiresRuntimeInterfaceDiscovery = true;
|
||||||
|
runtimeDiscoveredHandlerInterfaceLogNames.Add(GetLogDisplayName(handlerInterface));
|
||||||
}
|
}
|
||||||
|
|
||||||
return new HandlerCandidateAnalysis(
|
return new HandlerCandidateAnalysis(
|
||||||
@ -137,7 +140,8 @@ public sealed class CqrsHandlerRegistryGenerator : IIncrementalGenerator
|
|||||||
reflectedImplementationRegistrations.ToImmutable(),
|
reflectedImplementationRegistrations.ToImmutable(),
|
||||||
preciseReflectedRegistrations.ToImmutable(),
|
preciseReflectedRegistrations.ToImmutable(),
|
||||||
canReferenceImplementation ? null : GetReflectionTypeMetadataName(type),
|
canReferenceImplementation ? null : GetReflectionTypeMetadataName(type),
|
||||||
requiresRuntimeInterfaceDiscovery);
|
requiresRuntimeInterfaceDiscovery,
|
||||||
|
runtimeDiscoveredHandlerInterfaceLogNames.ToImmutable());
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void Execute(SourceProductionContext context, GenerationEnvironment generationEnvironment,
|
private static void Execute(SourceProductionContext context, GenerationEnvironment generationEnvironment,
|
||||||
@ -182,7 +186,8 @@ public sealed class CqrsHandlerRegistryGenerator : IIncrementalGenerator
|
|||||||
candidate.ReflectedImplementationRegistrations,
|
candidate.ReflectedImplementationRegistrations,
|
||||||
candidate.PreciseReflectedRegistrations,
|
candidate.PreciseReflectedRegistrations,
|
||||||
candidate.ReflectionTypeMetadataName,
|
candidate.ReflectionTypeMetadataName,
|
||||||
candidate.RequiresRuntimeInterfaceDiscovery));
|
candidate.RequiresRuntimeInterfaceDiscovery,
|
||||||
|
candidate.RuntimeDiscoveredHandlerInterfaceLogNames));
|
||||||
}
|
}
|
||||||
|
|
||||||
registrations.Sort(static (left, right) =>
|
registrations.Sort(static (left, right) =>
|
||||||
@ -655,6 +660,13 @@ public sealed class CqrsHandlerRegistryGenerator : IIncrementalGenerator
|
|||||||
builder.Append(" var ");
|
builder.Append(" var ");
|
||||||
builder.Append(knownServiceTypesVariableName);
|
builder.Append(knownServiceTypesVariableName);
|
||||||
builder.AppendLine(" = new global::System.Collections.Generic.HashSet<global::System.Type>();");
|
builder.AppendLine(" = new global::System.Collections.Generic.HashSet<global::System.Type>();");
|
||||||
|
foreach (var runtimeDiscoveredHandlerInterfaceLogName in registration
|
||||||
|
.RuntimeDiscoveredHandlerInterfaceLogNames)
|
||||||
|
{
|
||||||
|
builder.Append(" // Remaining runtime interface discovery target: ");
|
||||||
|
builder.Append(runtimeDiscoveredHandlerInterfaceLogName);
|
||||||
|
builder.AppendLine();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (var orderedRegistration in orderedRegistrations)
|
foreach (var orderedRegistration in orderedRegistrations)
|
||||||
@ -1090,7 +1102,8 @@ public sealed class CqrsHandlerRegistryGenerator : IIncrementalGenerator
|
|||||||
ImmutableArray<ReflectedImplementationRegistrationSpec> ReflectedImplementationRegistrations,
|
ImmutableArray<ReflectedImplementationRegistrationSpec> ReflectedImplementationRegistrations,
|
||||||
ImmutableArray<PreciseReflectedRegistrationSpec> PreciseReflectedRegistrations,
|
ImmutableArray<PreciseReflectedRegistrationSpec> PreciseReflectedRegistrations,
|
||||||
string? ReflectionTypeMetadataName,
|
string? ReflectionTypeMetadataName,
|
||||||
bool RequiresRuntimeInterfaceDiscovery);
|
bool RequiresRuntimeInterfaceDiscovery,
|
||||||
|
ImmutableArray<string> RuntimeDiscoveredHandlerInterfaceLogNames);
|
||||||
|
|
||||||
private readonly struct HandlerCandidateAnalysis : IEquatable<HandlerCandidateAnalysis>
|
private readonly struct HandlerCandidateAnalysis : IEquatable<HandlerCandidateAnalysis>
|
||||||
{
|
{
|
||||||
@ -1101,7 +1114,8 @@ public sealed class CqrsHandlerRegistryGenerator : IIncrementalGenerator
|
|||||||
ImmutableArray<ReflectedImplementationRegistrationSpec> reflectedImplementationRegistrations,
|
ImmutableArray<ReflectedImplementationRegistrationSpec> reflectedImplementationRegistrations,
|
||||||
ImmutableArray<PreciseReflectedRegistrationSpec> preciseReflectedRegistrations,
|
ImmutableArray<PreciseReflectedRegistrationSpec> preciseReflectedRegistrations,
|
||||||
string? reflectionTypeMetadataName,
|
string? reflectionTypeMetadataName,
|
||||||
bool requiresRuntimeInterfaceDiscovery)
|
bool requiresRuntimeInterfaceDiscovery,
|
||||||
|
ImmutableArray<string> runtimeDiscoveredHandlerInterfaceLogNames)
|
||||||
{
|
{
|
||||||
ImplementationTypeDisplayName = implementationTypeDisplayName;
|
ImplementationTypeDisplayName = implementationTypeDisplayName;
|
||||||
ImplementationLogName = implementationLogName;
|
ImplementationLogName = implementationLogName;
|
||||||
@ -1110,6 +1124,7 @@ public sealed class CqrsHandlerRegistryGenerator : IIncrementalGenerator
|
|||||||
PreciseReflectedRegistrations = preciseReflectedRegistrations;
|
PreciseReflectedRegistrations = preciseReflectedRegistrations;
|
||||||
ReflectionTypeMetadataName = reflectionTypeMetadataName;
|
ReflectionTypeMetadataName = reflectionTypeMetadataName;
|
||||||
RequiresRuntimeInterfaceDiscovery = requiresRuntimeInterfaceDiscovery;
|
RequiresRuntimeInterfaceDiscovery = requiresRuntimeInterfaceDiscovery;
|
||||||
|
RuntimeDiscoveredHandlerInterfaceLogNames = runtimeDiscoveredHandlerInterfaceLogNames;
|
||||||
}
|
}
|
||||||
|
|
||||||
public string ImplementationTypeDisplayName { get; }
|
public string ImplementationTypeDisplayName { get; }
|
||||||
@ -1126,6 +1141,8 @@ public sealed class CqrsHandlerRegistryGenerator : IIncrementalGenerator
|
|||||||
|
|
||||||
public bool RequiresRuntimeInterfaceDiscovery { get; }
|
public bool RequiresRuntimeInterfaceDiscovery { get; }
|
||||||
|
|
||||||
|
public ImmutableArray<string> RuntimeDiscoveredHandlerInterfaceLogNames { get; }
|
||||||
|
|
||||||
public bool Equals(HandlerCandidateAnalysis other)
|
public bool Equals(HandlerCandidateAnalysis other)
|
||||||
{
|
{
|
||||||
if (!string.Equals(ImplementationTypeDisplayName, other.ImplementationTypeDisplayName,
|
if (!string.Equals(ImplementationTypeDisplayName, other.ImplementationTypeDisplayName,
|
||||||
@ -1136,7 +1153,9 @@ public sealed class CqrsHandlerRegistryGenerator : IIncrementalGenerator
|
|||||||
RequiresRuntimeInterfaceDiscovery != other.RequiresRuntimeInterfaceDiscovery ||
|
RequiresRuntimeInterfaceDiscovery != other.RequiresRuntimeInterfaceDiscovery ||
|
||||||
Registrations.Length != other.Registrations.Length ||
|
Registrations.Length != other.Registrations.Length ||
|
||||||
ReflectedImplementationRegistrations.Length != other.ReflectedImplementationRegistrations.Length ||
|
ReflectedImplementationRegistrations.Length != other.ReflectedImplementationRegistrations.Length ||
|
||||||
PreciseReflectedRegistrations.Length != other.PreciseReflectedRegistrations.Length)
|
PreciseReflectedRegistrations.Length != other.PreciseReflectedRegistrations.Length ||
|
||||||
|
RuntimeDiscoveredHandlerInterfaceLogNames.Length !=
|
||||||
|
other.RuntimeDiscoveredHandlerInterfaceLogNames.Length)
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -1160,6 +1179,17 @@ public sealed class CqrsHandlerRegistryGenerator : IIncrementalGenerator
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for (var index = 0; index < RuntimeDiscoveredHandlerInterfaceLogNames.Length; index++)
|
||||||
|
{
|
||||||
|
if (!string.Equals(
|
||||||
|
RuntimeDiscoveredHandlerInterfaceLogNames[index],
|
||||||
|
other.RuntimeDiscoveredHandlerInterfaceLogNames[index],
|
||||||
|
StringComparison.Ordinal))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1194,6 +1224,12 @@ public sealed class CqrsHandlerRegistryGenerator : IIncrementalGenerator
|
|||||||
hashCode = (hashCode * 397) ^ preciseReflectedRegistration.GetHashCode();
|
hashCode = (hashCode * 397) ^ preciseReflectedRegistration.GetHashCode();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
foreach (var runtimeDiscoveredHandlerInterfaceLogName in RuntimeDiscoveredHandlerInterfaceLogNames)
|
||||||
|
{
|
||||||
|
hashCode = (hashCode * 397) ^
|
||||||
|
StringComparer.Ordinal.GetHashCode(runtimeDiscoveredHandlerInterfaceLogName);
|
||||||
|
}
|
||||||
|
|
||||||
return hashCode;
|
return hashCode;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user