mirror of
https://github.com/mbierlee/poodinis.git
synced 2024-11-15 04:04:01 +01:00
Synchronize DependencyContainer
The implication is that dependency containers are now always shared data. In the sense of application context, this is acceptable.
This commit is contained in:
Mike Bierlee
parent
8d268846ed
commit
9860624148
|
|
@ -79,7 +79,7 @@ private void printDebugAutowiredInstance(TypeInfo instanceType, void* instanceAd
|
|||
*
|
||||
* See_Also: Autowire
|
||||
*/
|
||||
public void autowire(Type)(DependencyContainer container, Type instance) {
|
||||
public void autowire(Type)(shared(DependencyContainer) container, Type instance) {
|
||||
debug(poodinisVerbose) {
|
||||
printDebugAutowiredInstance(typeid(Type), &instance);
|
||||
}
|
||||
|
|
@ -93,7 +93,7 @@ private void printDebugAutowiringCandidate(TypeInfo candidateInstanceType, void*
|
|||
writeln(format("DEBUG: Autowired instance [%s@%s] to [%s@%s].%s", candidateInstanceType, candidateInstanceAddress, instanceType, instanceAddress, member));
|
||||
}
|
||||
|
||||
private void autowireMember(string member, Type)(DependencyContainer container, Type instance) {
|
||||
private void autowireMember(string member, Type)(shared(DependencyContainer) container, Type instance) {
|
||||
static if(__traits(compiles, __traits(getMember, instance, member)) && __traits(compiles, __traits(getAttributes, __traits(getMember, instance, member)))) {
|
||||
foreach(autowireAttribute; __traits(getAttributes, __traits(getMember, instance, member))) {
|
||||
static if (__traits(isSame, autowireAttribute, Autowire) || is(autowireAttribute == Autowire!T, T)) {
|
||||
|
|
@ -138,9 +138,9 @@ public void globalAutowire(Type)(Type instance) {
|
|||
}
|
||||
|
||||
class AutowiredRegistration(RegistrationType : Object) : Registration {
|
||||
private DependencyContainer container;
|
||||
private shared(DependencyContainer) container;
|
||||
|
||||
public this(TypeInfo registeredType, DependencyContainer container) {
|
||||
public this(TypeInfo registeredType, shared(DependencyContainer) container) {
|
||||
enforce(!(container is null), "Argument 'container' is null. Autowired registrations need to autowire using a container.");
|
||||
this.container = container;
|
||||
super(registeredType, typeid(RegistrationType));
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ class ResolveException : Exception {
|
|||
* In most cases you want to use a global singleton dependency container provided by getInstance() to manage all dependencies.
|
||||
* You can still create new instances of this class for exceptional situations.
|
||||
*/
|
||||
class DependencyContainer {
|
||||
synchronized class DependencyContainer {
|
||||
private Registration[][TypeInfo] registrations;
|
||||
|
||||
private Registration[] autowireStack;
|
||||
|
|
@ -111,16 +111,16 @@ class DependencyContainer {
|
|||
return existingRegistration;
|
||||
}
|
||||
|
||||
AutowiredRegistration!ConcreteType newRegistration = new AutowiredRegistration!ConcreteType(registeredType, this);
|
||||
auto newRegistration = new AutowiredRegistration!ConcreteType(registeredType, this);
|
||||
newRegistration.singleInstance();
|
||||
registrations[registeredType] ~= newRegistration;
|
||||
registrations[registeredType] ~= cast(shared(Registration)) newRegistration;
|
||||
return newRegistration;
|
||||
}
|
||||
|
||||
private Registration getExistingRegistration(TypeInfo registrationType, TypeInfo qualifierType) {
|
||||
auto existingCandidates = registrationType in registrations;
|
||||
if (existingCandidates) {
|
||||
return getRegistration(*existingCandidates, qualifierType);
|
||||
return getRegistration(cast(Registration[]) *existingCandidates, qualifierType);
|
||||
}
|
||||
|
||||
return null;
|
||||
|
|
@ -218,13 +218,13 @@ class DependencyContainer {
|
|||
throw new ResolveException("Type not registered.", resolveType);
|
||||
}
|
||||
|
||||
Registration registration = getQualifiedRegistration(resolveType, qualifierType, *candidates);
|
||||
Registration registration = getQualifiedRegistration(resolveType, qualifierType, cast(Registration[]) *candidates);
|
||||
QualifierType instance;
|
||||
|
||||
if (!autowireStack.canFind(registration)) {
|
||||
autowireStack ~= registration;
|
||||
if (!(cast(Registration[]) autowireStack).canFind(registration)) {
|
||||
autowireStack ~= cast(shared(Registration)) registration;
|
||||
instance = cast(QualifierType) registration.getInstance(new AutowireInstantiationContext());
|
||||
autowireStack.popBack();
|
||||
autowireStack = autowireStack[0 .. $-1];
|
||||
} else {
|
||||
auto autowireContext = new AutowireInstantiationContext();
|
||||
autowireContext.autowireInstance = false;
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ version(unittest) {
|
|||
|
||||
// Test autowiring concrete type to existing instance
|
||||
unittest {
|
||||
auto container = new DependencyContainer();
|
||||
shared(DependencyContainer) container = new DependencyContainer();
|
||||
container.register!ComponentA;
|
||||
auto componentB = new ComponentB();
|
||||
container.autowire!(ComponentB)(componentB);
|
||||
|
|
@ -78,7 +78,7 @@ version(unittest) {
|
|||
|
||||
// Test autowiring interface type to existing instance
|
||||
unittest {
|
||||
auto container = new DependencyContainer();
|
||||
shared(DependencyContainer) container = new DependencyContainer();
|
||||
container.register!(InterfaceA, ComponentC);
|
||||
auto componentD = new ComponentD();
|
||||
container.autowire!(ComponentD)(componentD);
|
||||
|
|
@ -87,7 +87,7 @@ version(unittest) {
|
|||
|
||||
// Test autowiring will only happen once
|
||||
unittest {
|
||||
auto container = new DependencyContainer();
|
||||
shared(DependencyContainer) container = new DependencyContainer();
|
||||
container.register!(InterfaceA, ComponentC).newInstance();
|
||||
auto componentD = new ComponentD();
|
||||
container.autowire!(ComponentD)(componentD);
|
||||
|
|
@ -99,14 +99,14 @@ version(unittest) {
|
|||
|
||||
// Test autowiring unregistered type
|
||||
unittest {
|
||||
auto container = new DependencyContainer();
|
||||
shared(DependencyContainer) container = new DependencyContainer();
|
||||
auto componentD = new ComponentD();
|
||||
assertThrown!(ResolveException)(container.autowire!(ComponentD)(componentD), "Autowiring unregistered type should throw ResolveException");
|
||||
}
|
||||
|
||||
// Test autowiring member with non-autowire attribute does not autowire
|
||||
unittest {
|
||||
auto container = new DependencyContainer();
|
||||
shared(DependencyContainer) container = new DependencyContainer();
|
||||
auto componentE = new ComponentE();
|
||||
container.autowire!ComponentE(componentE);
|
||||
assert(componentE.componentC is null, "Autowiring should not occur for members with attributes other than @Autowire");
|
||||
|
|
@ -114,7 +114,7 @@ version(unittest) {
|
|||
|
||||
// Test autowire class with alias declaration
|
||||
unittest {
|
||||
auto container = new DependencyContainer();
|
||||
shared(DependencyContainer) container = new DependencyContainer();
|
||||
container.register!ComponentA;
|
||||
auto componentDeclarationCocktail = new ComponentDeclarationCocktail();
|
||||
|
||||
|
|
@ -125,7 +125,7 @@ version(unittest) {
|
|||
|
||||
// Test autowire class with qualifier
|
||||
unittest {
|
||||
auto container = new DependencyContainer();
|
||||
shared(DependencyContainer) container = new DependencyContainer();
|
||||
container.register!(InterfaceA, ComponentC);
|
||||
container.register!(InterfaceA, ComponentX);
|
||||
auto componentX = container.resolve!(InterfaceA, ComponentX);
|
||||
|
|
@ -138,7 +138,7 @@ version(unittest) {
|
|||
|
||||
// Test autowire class with multiple qualifiers
|
||||
unittest {
|
||||
auto container = new DependencyContainer();
|
||||
shared(DependencyContainer) container = new DependencyContainer();
|
||||
container.register!(InterfaceA, ComponentC);
|
||||
container.register!(InterfaceA, ComponentX);
|
||||
auto componentC = container.resolve!(InterfaceA, ComponentC);
|
||||
|
|
@ -153,7 +153,7 @@ version(unittest) {
|
|||
|
||||
// Test getting instance from autowired registration will autowire instance
|
||||
unittest {
|
||||
auto container = new DependencyContainer();
|
||||
shared(DependencyContainer) container = new DependencyContainer();
|
||||
container.register!ComponentA;
|
||||
|
||||
auto registration = new AutowiredRegistration!ComponentB(typeid(ComponentB), container).singleInstance();
|
||||
|
|
|
|||
|
|
@ -102,14 +102,14 @@ version(unittest) {
|
|||
|
||||
// Test register concrete type
|
||||
unittest {
|
||||
auto container = new DependencyContainer();
|
||||
shared(DependencyContainer) container = new DependencyContainer();
|
||||
auto registration = container.register!(TestClass)();
|
||||
assert(registration.registeredType == typeid(TestClass), "Type of registered type not the same");
|
||||
}
|
||||
|
||||
// Test resolve registered type
|
||||
unittest {
|
||||
auto container = new DependencyContainer();
|
||||
shared(DependencyContainer) container = new DependencyContainer();
|
||||
container.register!(TestClass)();
|
||||
TestClass actualInstance = container.resolve!(TestClass)();
|
||||
assert(actualInstance !is null, "Resolved type is null");
|
||||
|
|
@ -118,7 +118,7 @@ version(unittest) {
|
|||
|
||||
// Test register interface
|
||||
unittest {
|
||||
auto container = new DependencyContainer();
|
||||
shared(DependencyContainer) container = new DependencyContainer();
|
||||
container.register!(TestInterface, TestClass)();
|
||||
TestInterface actualInstance = container.resolve!(TestInterface)();
|
||||
assert(actualInstance !is null, "Resolved type is null");
|
||||
|
|
@ -127,13 +127,13 @@ version(unittest) {
|
|||
|
||||
// Test resolve non-registered type
|
||||
unittest {
|
||||
auto container = new DependencyContainer();
|
||||
shared(DependencyContainer) container = new DependencyContainer();
|
||||
assertThrown!ResolveException(container.resolve!(TestClass)(), "Resolving non-registered type does not fail");
|
||||
}
|
||||
|
||||
// Test clear registrations
|
||||
unittest {
|
||||
auto container = new DependencyContainer();
|
||||
shared(DependencyContainer) container = new DependencyContainer();
|
||||
container.register!(TestClass)();
|
||||
container.clearAllRegistrations();
|
||||
assertThrown!ResolveException(container.resolve!(TestClass)(), "Resolving cleared type does not fail");
|
||||
|
|
@ -148,7 +148,7 @@ version(unittest) {
|
|||
|
||||
// Test resolve single instance for type
|
||||
unittest {
|
||||
auto container = new DependencyContainer();
|
||||
shared(DependencyContainer) container = new DependencyContainer();
|
||||
container.register!(TestClass)().singleInstance();
|
||||
auto instance1 = container.resolve!(TestClass);
|
||||
auto instance2 = container.resolve!(TestClass);
|
||||
|
|
@ -157,7 +157,7 @@ version(unittest) {
|
|||
|
||||
// Test resolve new instance for type
|
||||
unittest {
|
||||
auto container = new DependencyContainer();
|
||||
shared(DependencyContainer) container = new DependencyContainer();
|
||||
container.register!(TestClass)().newInstance();
|
||||
auto instance1 = container.resolve!(TestClass);
|
||||
auto instance2 = container.resolve!(TestClass);
|
||||
|
|
@ -166,7 +166,7 @@ version(unittest) {
|
|||
|
||||
// Test resolve existing instance for type
|
||||
unittest {
|
||||
auto container = new DependencyContainer();
|
||||
shared(DependencyContainer) container = new DependencyContainer();
|
||||
auto expectedInstance = new TestClass();
|
||||
container.register!(TestClass)().existingInstance(expectedInstance);
|
||||
auto actualInstance = container.resolve!(TestClass);
|
||||
|
|
@ -175,7 +175,7 @@ version(unittest) {
|
|||
|
||||
// Test autowire resolved instances
|
||||
unittest {
|
||||
auto container = new DependencyContainer();
|
||||
shared(DependencyContainer) container = new DependencyContainer();
|
||||
container.register!AutowiredClass;
|
||||
container.register!ComponentClass;
|
||||
auto componentInstance = container.resolve!ComponentClass;
|
||||
|
|
@ -185,7 +185,7 @@ version(unittest) {
|
|||
|
||||
// Test circular autowiring
|
||||
unittest {
|
||||
auto container = new DependencyContainer();
|
||||
shared(DependencyContainer) container = new DependencyContainer();
|
||||
container.register!ComponentMouse;
|
||||
container.register!ComponentCat;
|
||||
auto mouse = container.resolve!ComponentMouse;
|
||||
|
|
@ -195,7 +195,7 @@ version(unittest) {
|
|||
|
||||
// Test remove registration
|
||||
unittest {
|
||||
auto container = new DependencyContainer();
|
||||
shared(DependencyContainer) container = new DependencyContainer();
|
||||
container.register!TestClass;
|
||||
container.removeRegistration!TestClass;
|
||||
assertThrown!ResolveException(container.resolve!TestClass);
|
||||
|
|
@ -203,7 +203,7 @@ version(unittest) {
|
|||
|
||||
// Test autowiring does not autowire member where instance is non-null
|
||||
unittest {
|
||||
auto container = new DependencyContainer();
|
||||
shared(DependencyContainer) container = new DependencyContainer();
|
||||
auto existingA = new AutowiredClass();
|
||||
auto existingB = new ComponentClass();
|
||||
existingB.autowiredClass = existingA;
|
||||
|
|
@ -218,7 +218,7 @@ version(unittest) {
|
|||
|
||||
// Test autowiring circular dependency by third-degree
|
||||
unittest {
|
||||
auto container = new DependencyContainer();
|
||||
shared(DependencyContainer) container = new DependencyContainer();
|
||||
container.register!Eenie;
|
||||
container.register!Meenie;
|
||||
container.register!Moe;
|
||||
|
|
@ -230,7 +230,7 @@ version(unittest) {
|
|||
|
||||
// Test autowiring deep circular dependencies
|
||||
unittest {
|
||||
auto container = new DependencyContainer();
|
||||
shared(DependencyContainer) container = new DependencyContainer();
|
||||
container.register!Ittie;
|
||||
container.register!Bittie;
|
||||
container.register!Banana;
|
||||
|
|
@ -242,7 +242,7 @@ version(unittest) {
|
|||
|
||||
// Test autowiring deep circular dependencies with newInstance scope does not autowire new instance second time
|
||||
unittest {
|
||||
auto container = new DependencyContainer();
|
||||
shared(DependencyContainer) container = new DependencyContainer();
|
||||
container.register!(Ittie).newInstance();
|
||||
container.register!(Bittie).newInstance();
|
||||
container.register!(Banana).newInstance();
|
||||
|
|
@ -254,7 +254,7 @@ version(unittest) {
|
|||
|
||||
// Test autowiring type registered by interface
|
||||
unittest {
|
||||
auto container = new DependencyContainer();
|
||||
shared(DependencyContainer) container = new DependencyContainer();
|
||||
container.register!Banana;
|
||||
container.register!Bittie;
|
||||
container.register!(SuperInterface, SuperImplementation);
|
||||
|
|
@ -266,7 +266,7 @@ version(unittest) {
|
|||
|
||||
// Test reusing a container after clearing all registrations
|
||||
unittest {
|
||||
auto container = new DependencyContainer();
|
||||
shared(DependencyContainer) container = new DependencyContainer();
|
||||
container.register!Banana;
|
||||
container.clearAllRegistrations();
|
||||
try {
|
||||
|
|
@ -280,14 +280,14 @@ version(unittest) {
|
|||
|
||||
// Test register multiple concrete classess to same interface type
|
||||
unittest {
|
||||
auto container = new DependencyContainer();
|
||||
shared(DependencyContainer) container = new DependencyContainer();
|
||||
container.register!(Color, Blue);
|
||||
container.register!(Color, Red);
|
||||
}
|
||||
|
||||
// Test removing all registrations for type with multiple registrations.
|
||||
unittest {
|
||||
auto container = new DependencyContainer();
|
||||
shared(DependencyContainer) container = new DependencyContainer();
|
||||
container.register!(Color, Blue);
|
||||
container.register!(Color, Red);
|
||||
container.removeRegistration!Color;
|
||||
|
|
@ -295,7 +295,7 @@ version(unittest) {
|
|||
|
||||
// Test registering same registration again
|
||||
unittest {
|
||||
auto container = new DependencyContainer();
|
||||
shared(DependencyContainer) container = new DependencyContainer();
|
||||
auto firstRegistration = container.register!(Color, Blue);
|
||||
auto secondRegistration = container.register!(Color, Blue);
|
||||
|
||||
|
|
@ -304,7 +304,7 @@ version(unittest) {
|
|||
|
||||
// Test resolve registration with multiple qualifiers
|
||||
unittest {
|
||||
auto container = new DependencyContainer();
|
||||
shared(DependencyContainer) container = new DependencyContainer();
|
||||
container.register!(Color, Blue);
|
||||
container.register!(Color, Red);
|
||||
try {
|
||||
|
|
@ -317,7 +317,7 @@ version(unittest) {
|
|||
|
||||
// Test resolve registration with multiple qualifiers using a qualifier
|
||||
unittest {
|
||||
auto container = new DependencyContainer();
|
||||
shared(DependencyContainer) container = new DependencyContainer();
|
||||
container.register!(Color, Blue);
|
||||
container.register!(Color, Red);
|
||||
auto blueInstance = container.resolve!(Color, Blue);
|
||||
|
|
@ -330,7 +330,7 @@ version(unittest) {
|
|||
|
||||
// Test autowire of unqualified member typed by interface.
|
||||
unittest {
|
||||
auto container = new DependencyContainer();
|
||||
shared(DependencyContainer) container = new DependencyContainer();
|
||||
container.register!Spiders;
|
||||
container.register!(TestInterface, TestClass);
|
||||
|
||||
|
|
@ -341,7 +341,7 @@ version(unittest) {
|
|||
|
||||
// Register existing registration
|
||||
unittest {
|
||||
auto container = new DependencyContainer();
|
||||
shared(DependencyContainer) container = new DependencyContainer();
|
||||
|
||||
auto firstRegistration = container.register!TestClass;
|
||||
auto secondRegistration = container.register!TestClass;
|
||||
|
|
@ -351,7 +351,7 @@ version(unittest) {
|
|||
|
||||
// Register existing registration by supertype
|
||||
unittest {
|
||||
auto container = new DependencyContainer();
|
||||
shared(DependencyContainer) container = new DependencyContainer();
|
||||
|
||||
auto firstRegistration = container.register!(TestInterface, TestClass);
|
||||
auto secondRegistration = container.register!(TestInterface, TestClass);
|
||||
|
|
@ -361,7 +361,7 @@ version(unittest) {
|
|||
|
||||
// Resolve dependency depending on itself
|
||||
unittest {
|
||||
auto container = new DependencyContainer();
|
||||
shared(DependencyContainer) container = new DependencyContainer();
|
||||
container.register!Recursive;
|
||||
|
||||
auto instance = container.resolve!Recursive;
|
||||
|
|
|
|||
Loading…
Reference in a new issue