Non-functional changes only

5 files changed, 44 insertions, 41 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java
index 9ca5904a7c5..e65fd863d7d 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java
@@ -115,10 +115,10 @@ public class VespaDomBuilder extends VespaModelBuilder {
      * @param <T> an {@link com.yahoo.config.model.producer.AbstractConfigProducer}
      * @author vegardh
      */
-    public static abstract class DomConfigProducerBuilder<T extends AbstractConfigProducer> {
+    public static abstract class DomConfigProducerBuilder<T extends AbstractConfigProducer<?>> {
 
         // TODO: find good way to provide access to app package
-        public final T build(DeployState deployState, AbstractConfigProducer ancestor, Element producerSpec) {
+        public final T build(DeployState deployState, AbstractConfigProducer<?> ancestor, Element producerSpec) {
             T t = doBuild(deployState, ancestor, producerSpec);
 
             if (t instanceof AbstractService) {
@@ -130,9 +130,9 @@ public class VespaDomBuilder extends VespaModelBuilder {
             return t;
         }
 
-        protected abstract T doBuild(DeployState deployState, AbstractConfigProducer ancestor, Element producerSpec);
+        protected abstract T doBuild(DeployState deployState, AbstractConfigProducer<?> ancestor, Element producerSpec);
 
-        private void initializeProducer(AbstractConfigProducer child, DeployState deployState, Element producerSpec) {
+        private void initializeProducer(AbstractConfigProducer<?> child, DeployState deployState, Element producerSpec) {
             UserConfigRepo userConfigs = UserConfigBuilder.build(producerSpec, deployState, deployState.getDeployLogger());
             // TODO: must be made to work:
             //userConfigs.applyWarnings(child);
@@ -208,16 +208,18 @@ public class VespaDomBuilder extends VespaModelBuilder {
      *
      * @author vegardh
      */
-    static class DomSimpleConfigProducerBuilder extends DomConfigProducerBuilder<SimpleConfigProducer> {
-        private String configId;
+    static class DomSimpleConfigProducerBuilder extends DomConfigProducerBuilder<SimpleConfigProducer<?>> {
+
+        private final String configId;
 
         DomSimpleConfigProducerBuilder(String configId) {
             this.configId = configId;
         }
 
         @Override
-        protected SimpleConfigProducer doBuild(DeployState deployState, AbstractConfigProducer parent, Element producerSpec) {
-            return new SimpleConfigProducer(parent, configId);
+        protected SimpleConfigProducer<?> doBuild(DeployState deployState, AbstractConfigProducer<?> parent,
+                                                  Element producerSpec) {
+            return new SimpleConfigProducer<>(parent, configId);
         }
     }
 
@@ -232,7 +234,7 @@ public class VespaDomBuilder extends VespaModelBuilder {
         }
 
         @Override
-        protected ApplicationConfigProducerRoot doBuild(DeployState deployState, AbstractConfigProducer parent, Element producerSpec) {
+        protected ApplicationConfigProducerRoot doBuild(DeployState deployState, AbstractConfigProducer<?> parent, Element producerSpec) {
             ApplicationConfigProducerRoot root = new ApplicationConfigProducerRoot(parent,
                                                                                    name,
                                                                                    deployState.getDocumentModel(),
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomFederationSearcherBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomFederationSearcherBuilder.java
index 2cc29ad9b36..3a4e8a70613 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomFederationSearcherBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomFederationSearcherBuilder.java
@@ -23,10 +23,13 @@ import java.util.Optional;
 
 /**
  * Builds a federation searcher config producer from an element.
+ *
  * @author Tony Vaagenes
  */
 public class DomFederationSearcherBuilder extends VespaDomBuilder.DomConfigProducerBuilder<Searcher<?>> {
+
     static class FederationSearcherModelBuilder extends GenericChainedComponentModelBuilder {
+
         private final List<FederationSearcherModel.TargetSpec> sources;
         private final boolean inheritDefaultSources;
 
@@ -69,6 +72,7 @@ public class DomFederationSearcherBuilder extends VespaDomBuilder.DomConfigProdu
         protected FederationSearcherModel build() {
             return new FederationSearcherModel(componentId, dependencies, sources, inheritDefaultSources);
         }
+
     }
 
     @Override
@@ -86,4 +90,5 @@ public class DomFederationSearcherBuilder extends VespaDomBuilder.DomConfigProdu
 
         return Optional.of(new DomComponentBuilder(namespace).build(deployState, ancestor, targetSelectorElement));
     }
+
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/SearchChains.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/SearchChains.java
index 151392f076d..eed8d728ae8 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/SearchChains.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/SearchChains.java
@@ -21,7 +21,7 @@ public class SearchChains extends Chains<SearchChain> {
 
     private final SourceGroupRegistry sourceGroups = new SourceGroupRegistry();
 
-    public SearchChains(AbstractConfigProducer parent, String subId) {
+    public SearchChains(AbstractConfigProducer<?> parent, String subId) {
         super(parent, subId);
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/defaultsearchchains/VespaSearchChainsCreator.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/defaultsearchchains/VespaSearchChainsCreator.java
index 7d53adbb233..a277b6e6b2f 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/defaultsearchchains/VespaSearchChainsCreator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/defaultsearchchains/VespaSearchChainsCreator.java
@@ -17,13 +17,15 @@ import java.util.*;
 /**
  * Creates the search chains vespaPhases, vespa and native.
  *
- * <p>TODO: refactor</p>
  * @author Tony Vaagenes
  */
+// TODO: refactor
 public class VespaSearchChainsCreator {
+
     private static class PhasesCreator {
+
         private static Set<String> set(String successor) {
-            return successor == null ? null : new LinkedHashSet<>(Arrays.asList(successor));
+            return successor == null ? null : new LinkedHashSet<>(List.of(successor));
         }
 
         private static String lastElement(String[] phases) {
@@ -83,35 +85,30 @@ public class VespaSearchChainsCreator {
         }
     }
 
-
     private static ChainSpecification nativeSearchChainSpecification() {
-        return new ChainSpecification(
-                new ComponentId("native"),
-                inheritsVespaPhases(),
-                noPhases(),
-                noSearcherReferences());
+        return new ChainSpecification(new ComponentId("native"),
+                                      inheritsVespaPhases(),
+                                      noPhases(),
+                                      noSearcherReferences());
     }
 
     private static ChainSpecification vespaSearchChainSpecification() {
-        return new ChainSpecification(
-                new ComponentId("vespa"),
-                inherits(nativeSearchChainSpecification().componentId),
-                noPhases(),
-                noSearcherReferences());
+        return new ChainSpecification(new ComponentId("vespa"),
+                                      inherits(nativeSearchChainSpecification().componentId),
+                                      noPhases(),
+                                      noSearcherReferences());
     }
 
-
     private static ChainSpecification vespaPhasesSpecification() {
-        return new ChainSpecification(
-                new ComponentId("vespaPhases"),
-                new ChainSpecification.Inheritance(null, null),
-                PhasesCreator.linearPhases(
-                        PhaseNames.RAW_QUERY,
-                        PhaseNames.TRANSFORMED_QUERY,
-                        PhaseNames.BLENDED_RESULT,
-                        PhaseNames.UNBLENDED_RESULT,
-                        PhaseNames.BACKEND),
-                noSearcherReferences());
+        return new ChainSpecification(new ComponentId("vespaPhases"),
+                                      new ChainSpecification.Inheritance(null, null),
+                                      PhasesCreator.linearPhases(
+                                              PhaseNames.RAW_QUERY,
+                                              PhaseNames.TRANSFORMED_QUERY,
+                                              PhaseNames.BLENDED_RESULT,
+                                              PhaseNames.UNBLENDED_RESULT,
+                                              PhaseNames.BACKEND),
+                                      noSearcherReferences());
     }
 
     private static SearchChain createVespaPhases() {
@@ -131,11 +128,9 @@ public class VespaSearchChainsCreator {
     }
 
     public static void addVespaSearchChains(SearchChains searchChains) {
-        searchChains.add(
-                createVespaPhases());
-        searchChains.add(
-                createNative());
-        searchChains.add(
-                createVespa());
+        searchChains.add(createVespaPhases());
+        searchChains.add(createNative());
+        searchChains.add(createVespa());
     }
+
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
index 73bb30bcc68..dc7b03b0064 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
@@ -513,7 +513,8 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
     }
 
     private ContainerSearch buildSearch(DeployState deployState, ApplicationContainerCluster containerCluster, Element producerSpec) {
-        SearchChains searchChains = new DomSearchChainsBuilder(null, false).build(deployState, containerCluster, producerSpec);
+        SearchChains searchChains = new DomSearchChainsBuilder(null, false)
+                                            .build(deployState, containerCluster, producerSpec);
 
         ContainerSearch containerSearch = new ContainerSearch(containerCluster, searchChains, new ContainerSearch.Options());