Remove duplication

z4kn4fein · Mar 12, 2022 · 1ca0d6e · 1ca0d6e
1 parent a675880
commit 1ca0d6e
Showing 1 changed file with 3 additions and 16 deletions.
diff --git a/src/StashboxContainer.Resolver.cs b/src/StashboxContainer.Resolver.cs
@@ -1,5 +1,4 @@
-using Stashbox.Exceptions;
-using Stashbox.Expressions;
+using Stashbox.Expressions;
 using Stashbox.Resolution;
 using Stashbox.Utils;
 using System;
@@ -15,23 +14,11 @@ public partial class StashboxContainer
     {
 		/// <inheritdoc />
 		public object? Resolve(Type typeFrom, bool nullResultAllowed, object[]? dependencyOverrides = null) =>
-			 nullResultAllowed
-				? dependencyOverrides == null
-					? this.ResolveOrDefault(typeFrom)
-					: this.ResolveOrDefault(typeFrom, dependencyOverrides)
-				: dependencyOverrides == null
-					? this.Resolve(typeFrom)
-					: this.Resolve(typeFrom, dependencyOverrides);
+			 this.rootScope.Resolve(typeFrom, nullResultAllowed, dependencyOverrides);
 
 		/// <inheritdoc />
 		public object? Resolve(Type typeFrom, object name, bool nullResultAllowed, object[]? dependencyOverrides = null) =>
-			nullResultAllowed
-				? dependencyOverrides == null
-					? this.ResolveOrDefault(typeFrom, name)
-					: this.ResolveOrDefault(typeFrom, name, dependencyOverrides)
-				: dependencyOverrides == null
-					? this.Resolve(typeFrom, name)
-					: this.Resolve(typeFrom, name, dependencyOverrides);
+			 this.rootScope.Resolve(typeFrom, name, nullResultAllowed, dependencyOverrides);
 
 		/// <inheritdoc />
 		public object Resolve(Type typeFrom)