No functional changes

2 files changed, 15 insertions, 18 deletions

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;
+        }
+    }
+
 }