1 files changed, 3 insertions, 19 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/federation/sourceref/SearchChainResolver.java b/container-search/src/main/java/com/yahoo/search/federation/sourceref/SearchChainResolver.java
index 7dc65c819e4..9e45b6576a6 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/sourceref/SearchChainResolver.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/sourceref/SearchChainResolver.java
@@ -46,16 +46,6 @@ public class SearchChainResolver {
 
     public static class Builder {
 
-        public interface InvocationSpecFactory {
-            SearchChainInvocationSpec create(ComponentId searchChainId, FederationOptions federationOptions, List<String> schemas);
-        }
-
-        private class DefaultInvocationSpecFactory implements InvocationSpecFactory {
-            public SearchChainInvocationSpec create(ComponentId searchChainId, FederationOptions federationOptions, List<String> schemas) {
-                return new SearchChainInvocationSpec(searchChainId, federationOptions, schemas);
-            }
-        }
-
         private final SortedSet<Target> defaultTargets = new TreeSet<>();
 
         private final ComponentRegistry<Target> targets = new ComponentRegistry<>() {
@@ -137,19 +127,13 @@ public class SearchChainResolver {
         this.defaultTargets = Collections.unmodifiableSortedSet(defaultTargets);
     }
 
-    public SearchChainInvocationSpec resolve(ComponentSpecification sourceRef, Properties sourceToProviderMap)
-            throws UnresolvedSearchChainException {
+    public ResolveResult resolve(ComponentSpecification sourceRef, Properties sourceToProviderMap) {
 
-        Target target = resolveTarget(sourceRef);
-        return target.responsibleSearchChain(sourceToProviderMap);
-    }
-
-    private Target resolveTarget(ComponentSpecification sourceRef) throws UnresolvedSearchChainException {
         Target target = targets.getComponent(sourceRef);
         if (target == null) {
-            throw UnresolvedSourceRefException.createForMissingSourceRef(sourceRef);
+            return new ResolveResult(SourceRefResolver.createForMissingSourceRef(sourceRef));
         }
-        return target;
+        return target.responsibleSearchChain(sourceToProviderMap);
     }
 
     public SortedSet<Target> allTopLevelTargets() {