Fix: Missign mapping exceptions are not thrown. Fix: @optional is set…

… to false when it has no value.
DoclerLabs · Dec 18, 2017 · 0bad1be · 0bad1be
1 parent a6e5b09
commit 0bad1be
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/src/hex/di/Injector.hx b/src/hex/di/Injector.hx
@@ -132,11 +132,6 @@ class Injector
 			return null;
 		}
 	}
-
-	inline function _getClassDescription( type : Class<Dynamic> )
-	{
-		return Reflect.getProperty( type, "__INJECTION" );
-	}
 
     public function instantiateUnmapped<T>( type : Class<T> ) : T
 	{
@@ -149,6 +144,10 @@ class Injector
 		{
 			instance = ( cast type ).__ac( this.getInstanceWithClassName );
 		}
+		catch ( e : MissingMappingException )
+		{
+			throw( e );
+		}
 		catch( e : Dynamic )
 		{
 			instance = Type.createInstance( type, [] );
@@ -161,9 +160,13 @@ class Injector
 				this._applyInjection( instance, type );
 			}
 		}
+		catch ( e : MissingMappingException )
+		{
+			throw( e );
+		}
 		catch ( e : Dynamic )
 		{
-
+			//Do nothing
 		}
 
 		return instance;

diff --git a/test/hex/di/mock/injectees/OptionalClassInjectee.hx b/test/hex/di/mock/injectees/OptionalClassInjectee.hx
@@ -11,7 +11,7 @@ import hex.di.mock.types.MockConstants;
 class OptionalClassInjectee implements IInjectorContainer
 {
 	@Inject
-	@Optional( true )
+	@Optional
 	public var property : Interface;
 
 	public function new() 

diff --git a/test/hex/di/mock/injectees/OptionalOneRequiredParameterMethodInjectee.hx b/test/hex/di/mock/injectees/OptionalOneRequiredParameterMethodInjectee.hx
@@ -12,7 +12,7 @@ class OptionalOneRequiredParameterMethodInjectee implements IInjectorContainer
 	var m_dependency : Interface;
 
 	@Inject
-	@Optional( true )
+	@Optional
 	public function setDependency( ?dependency : Interface ) : Void
 	{
 		this.m_dependency = dependency;