No functional changes

7 files changed, 17 insertions, 27 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/federation/FederationSearcher.java b/container-search/src/main/java/com/yahoo/search/federation/FederationSearcher.java
index f6bf91f5f85..8d0e4944ab8 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/FederationSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/FederationSearcher.java
@@ -338,9 +338,8 @@ public class FederationSearcher extends ForkingSearcher {
     private List<String> allSourceRefDescriptions() {
         List<String> descriptions = new ArrayList<>();
 
-        for (com.yahoo.search.federation.sourceref.Target target : searchChainResolver.allTopLevelTargets()) {
+        for (com.yahoo.search.federation.sourceref.Target target : searchChainResolver.allTopLevelTargets())
             descriptions.add(target.searchRefDescription());
-        }
         return descriptions;
     }
 
diff --git a/container-search/src/main/java/com/yahoo/search/federation/sourceref/SearchChainInvocationSpec.java b/container-search/src/main/java/com/yahoo/search/federation/sourceref/SearchChainInvocationSpec.java
index 6cb8d2ef174..59b4e521a56 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/sourceref/SearchChainInvocationSpec.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/sourceref/SearchChainInvocationSpec.java
@@ -9,7 +9,7 @@ import java.util.List;
 import java.util.Objects;
 
 /**
- * Specifices which search chain should be run and how it should be run.
+ * Specifies which search chain should be run and how it should be run.
  * This is a value object.
  *
  * @author Tony Vaagenes
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 36f6fe424a0..6626c1b3cc4 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
@@ -92,7 +92,6 @@ public class SearchChainResolver {
         public Builder addSourceForProvider(ComponentId sourceId, ComponentId providerId, ComponentId searchChainId,
                                             boolean isDefaultProviderForSource, FederationOptions federationOptions,
                                             List<String> documentTypes) {
-
             SearchChainInvocationSpec searchChainInvocationSpec =
                     new SearchChainInvocationSpec(searchChainId, sourceId, providerId, federationOptions, documentTypes);
 
@@ -133,7 +132,6 @@ public class SearchChainResolver {
         this.defaultTargets = Collections.unmodifiableSortedSet(defaultTargets);
     }
 
-
     public SearchChainInvocationSpec resolve(ComponentSpecification sourceRef, Properties sourceToProviderMap)
             throws UnresolvedSearchChainException {
 
diff --git a/container-search/src/main/java/com/yahoo/search/federation/sourceref/SingleTarget.java b/container-search/src/main/java/com/yahoo/search/federation/sourceref/SingleTarget.java
index 9c7e1024518..4613c73c4b4 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/sourceref/SingleTarget.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/sourceref/SingleTarget.java
@@ -5,8 +5,6 @@ import com.yahoo.component.ComponentId;
 import com.yahoo.processing.request.Properties;
 
 /**
- * TODO: What is this?
- *
 * @author Tony Vaagenes
 */
 public class SingleTarget extends Target {
diff --git a/container-search/src/main/java/com/yahoo/search/federation/sourceref/Target.java b/container-search/src/main/java/com/yahoo/search/federation/sourceref/Target.java
index f23e24525bb..1b11e588f11 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/sourceref/Target.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/sourceref/Target.java
@@ -6,8 +6,6 @@ import com.yahoo.component.ComponentId;
 import com.yahoo.processing.request.Properties;
 
 /**
- * TODO: What's this?
- *
  * @author Tony Vaagenes
  */
 public abstract class Target extends AbstractComponent {
diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/model/VespaSearchers.java b/container-search/src/main/java/com/yahoo/search/searchchain/model/VespaSearchers.java
index c264425cb9c..2f680a8f3bd 100644
--- a/container-search/src/main/java/com/yahoo/search/searchchain/model/VespaSearchers.java
+++ b/container-search/src/main/java/com/yahoo/search/searchchain/model/VespaSearchers.java
@@ -60,8 +60,9 @@ public class VespaSearchers {
 
     private static FederationSearcherModel federationSearcherModel() {
         return new FederationSearcherModel(new ComponentSpecification("federation"),
-                Dependencies.emptyDependencies(),
-                Collections.emptyList(), true);
+                                           Dependencies.emptyDependencies(),
+                                           Collections.emptyList(),
+                                           true);
     }
 
     private static boolean allAdded(Collection<ChainedComponentModel> searcherModels, Set<ComponentId> componentIds) {
diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/FederationSearcherModel.java b/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/FederationSearcherModel.java
index 2778f7e97db..01dccee5c7f 100644
--- a/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/FederationSearcherModel.java
+++ b/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/FederationSearcherModel.java
@@ -5,7 +5,6 @@ import java.util.List;
 
 import com.google.common.collect.ImmutableList;
 import com.yahoo.container.bundle.BundleInstantiationSpecification;
-import net.jcip.annotations.Immutable;
 
 import com.yahoo.component.ComponentSpecification;
 import com.yahoo.component.chain.dependencies.Dependencies;
@@ -17,23 +16,8 @@ import com.yahoo.search.federation.FederationSearcher;
  *
  * @author Tony Vaagenes
  */
-@Immutable
 public class FederationSearcherModel extends ChainedComponentModel {
 
-    /**
-     * Specifies one or more search chains that can be addressed
-     * as a single source.
-     */
-    public static class TargetSpec {
-        public final ComponentSpecification sourceSpec;
-        public final FederationOptions federationOptions;
-
-        public TargetSpec(ComponentSpecification sourceSpec, FederationOptions federationOptions) {
-            this.sourceSpec = sourceSpec;
-            this.federationOptions = federationOptions;
-        }
-    }
-
     private static final ComponentSpecification federationSearcherComponentSpecification =
             new ComponentSpecification(FederationSearcher.class.getName());
 
@@ -48,4 +32,16 @@ public class FederationSearcherModel extends ChainedComponentModel {
         this.targets = ImmutableList.copyOf(targets);
     }
 
+    /** Specifies one or more search chains that can be addressed as a single source. */
+    public static class TargetSpec {
+
+        public final ComponentSpecification sourceSpec;
+        public final FederationOptions federationOptions;
+
+        public TargetSpec(ComponentSpecification sourceSpec, FederationOptions federationOptions) {
+            this.sourceSpec = sourceSpec;
+            this.federationOptions = federationOptions;
+        }
+    }
+
 }