Fix deprecation warnings when resolving post-constructors and pre-destructors (fix #43)

This commit is contained in:
Mike Bierlee 2023-03-07 00:45:44 +03:00
parent d4ce13f8b1
commit dfac28102e
3 changed files with 31 additions and 14 deletions

View file

@ -370,16 +370,17 @@ class AutowiredRegistration(RegistrationType : Object) : Registration
void delegate() preDestructor = null; void delegate() preDestructor = null;
foreach (memberName; __traits(allMembers, RegistrationType)) foreach (memberName; __traits(allMembers, RegistrationType))
{ {
mixin(createImportsString!RegistrationType); foreach (overload; __traits(getOverloads, instance, memberName))
enum QualifiedName = fullyQualifiedName!RegistrationType ~ `.` ~ memberName; {
static if (__traits(compiles, __traits(getProtection, __traits(getMember, instance, memberName))) static if (__traits(compiles, __traits(getProtection, overload))
&& __traits(getProtection, __traits(getMember, instance, memberName)) == "public" && __traits(getProtection, overload) == "public"
&& isFunction!(mixin(QualifiedName)) && isFunction!overload
&& hasUDA!(__traits(getMember, instance, memberName), PreDestroy)) && hasUDA!(overload, PreDestroy))
{ {
preDestructor = &__traits(getMember, instance, memberName); preDestructor = &__traits(getMember, instance, memberName);
} }
} }
}
return preDestructor; return preDestructor;
} }

View file

@ -471,17 +471,18 @@ synchronized class DependencyContainer
{ {
foreach (memberName; __traits(allMembers, Type)) foreach (memberName; __traits(allMembers, Type))
{ {
mixin(createImportsString!Type); foreach (overload; __traits(getOverloads, instance, memberName))
enum QualifiedName = fullyQualifiedName!Type ~ `.` ~ memberName; {
static if (__traits(compiles, __traits(getProtection, __traits(getMember, instance, memberName))) static if (__traits(compiles, __traits(getProtection, overload))
&& __traits(getProtection, __traits(getMember, instance, memberName)) == "public" && __traits(getProtection, overload) == "public"
&& isFunction!(mixin(QualifiedName)) && isFunction!overload
&& hasUDA!(__traits(getMember, instance, memberName), PostConstruct)) && hasUDA!(overload, PostConstruct))
{ {
__traits(getMember, instance, memberName)(); __traits(getMember, instance, memberName)();
} }
} }
} }
}
/** /**
* Clears all dependency registrations managed by this container. * Clears all dependency registrations managed by this container.

View file

@ -804,4 +804,19 @@ version (unittest)
{ {
} }
class AutowiredMethod
{
@Autowire
public int lala()
{
return 42;
}
@Autowire
public int lala(int valla)
{
return valla;
}
}
} }