Remove cacheSize

15 files changed, 57 insertions, 94 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
index 02ef276dba3..778610bd63b 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
@@ -39,7 +39,7 @@ import static com.yahoo.vespa.model.admin.monitoring.MetricSet.empty;
  *
  * @author gjoranv
  */
-public class Admin extends AbstractConfigProducer implements Serializable {
+public class Admin extends AbstractConfigProducer<Admin> implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java
index b643f771d73..c5edfb9bbf7 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java
@@ -42,7 +42,9 @@ public abstract class DomAdminBuilderBase extends VespaDomBuilder.DomConfigProdu
     private final FileRegistry fileRegistry;
     protected final boolean multitenant;
 
-    DomAdminBuilderBase(ApplicationType applicationType, FileRegistry fileRegistry, boolean multitenant,
+    DomAdminBuilderBase(ApplicationType applicationType,
+                        FileRegistry fileRegistry,
+                        boolean multitenant,
                         List<ConfigServerSpec> configServerSpecs) {
         this.applicationType = applicationType;
         this.fileRegistry = fileRegistry;
@@ -50,7 +52,7 @@ public abstract class DomAdminBuilderBase extends VespaDomBuilder.DomConfigProdu
         this.configServerSpecs = configServerSpecs;
     }
 
-    List<Configserver> getConfigServersFromSpec(DeployLogger deployLogger, AbstractConfigProducer parent) {
+    List<Configserver> getConfigServersFromSpec(DeployLogger deployLogger, AbstractConfigProducer<?> parent) {
         List<Configserver> configservers = new ArrayList<>();
         for (ConfigServerSpec spec : configServerSpecs) {
             HostSystem hostSystem = parent.hostSystem();
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomComponentBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomComponentBuilder.java
index 4beefb84b71..a79db295df6 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomComponentBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomComponentBuilder.java
@@ -15,7 +15,7 @@ import org.w3c.dom.Element;
  * @author gjoranv
  * @author Tony Vaagenes
  */
-public class DomComponentBuilder extends VespaDomBuilder.DomConfigProducerBuilder<Component> {
+public class DomComponentBuilder extends VespaDomBuilder.DomConfigProducerBuilder<Component<?, ?>> {
 
     public static final String elementName = "component" ;
 
@@ -30,7 +30,7 @@ public class DomComponentBuilder extends VespaDomBuilder.DomConfigProducerBuilde
     }
 
     @Override
-    protected Component doBuild(DeployState deployState, AbstractConfigProducer ancestor, Element spec) {
+    protected Component doBuild(DeployState deployState, AbstractConfigProducer<?> ancestor, Element spec) {
         Component component = buildComponent(spec);
         addChildren(deployState, ancestor, spec, component);
         return component;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomFilterBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomFilterBuilder.java
deleted file mode 100644
index 7e97944612d..00000000000
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomFilterBuilder.java
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.model.builder.xml.dom;
-
-import com.yahoo.config.model.deploy.DeployState;
-import com.yahoo.config.model.producer.AbstractConfigProducer;
-import com.yahoo.vespa.model.container.component.Component;
-import com.yahoo.vespa.model.container.component.HttpFilter;
-import com.yahoo.vespa.model.container.xml.BundleInstantiationSpecificationBuilder;
-import org.w3c.dom.Element;
-
-/**
- * @author Tony Vaagenes
- */
-public class DomFilterBuilder extends VespaDomBuilder.DomConfigProducerBuilder<Component> {
-    @Override
-    protected Component doBuild(DeployState deployState, AbstractConfigProducer ancestor, Element element) {
-        return new HttpFilter(BundleInstantiationSpecificationBuilder.build(element));
-    }
-}
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomHandlerBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomHandlerBuilder.java
index 145535fe06f..71ff129ffbe 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomHandlerBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomHandlerBuilder.java
@@ -27,15 +27,14 @@ import static java.util.logging.Level.INFO;
 /**
  * @author gjoranv
  */
-public class DomHandlerBuilder extends VespaDomBuilder.DomConfigProducerBuilder<Handler> {
+public class DomHandlerBuilder extends VespaDomBuilder.DomConfigProducerBuilder<Handler<?>> {
 
     private static final Set<BindingPattern> reservedBindings =
-            Set.of(
-                    METRICS_V2_HANDLER_BINDING_1,
-                    METRICS_V2_HANDLER_BINDING_2,
-                    STATE_HANDLER_BINDING_1,
-                    STATE_HANDLER_BINDING_2,
-                    VIP_HANDLER_BINDING);
+            Set.of(METRICS_V2_HANDLER_BINDING_1,
+                   METRICS_V2_HANDLER_BINDING_2,
+                   STATE_HANDLER_BINDING_1,
+                   STATE_HANDLER_BINDING_2,
+                   VIP_HANDLER_BINDING);
 
     private final ApplicationContainerCluster cluster;
 
@@ -44,7 +43,7 @@ public class DomHandlerBuilder extends VespaDomBuilder.DomConfigProducerBuilder<
     }
 
     @Override
-    protected Handler doBuild(DeployState deployState, AbstractConfigProducer parent, Element handlerElement) {
+    protected Handler<?> doBuild(DeployState deployState, AbstractConfigProducer<?> parent, Element handlerElement) {
         Handler<? super Component<?, ?>> handler = createHandler(handlerElement);
 
         for (Element binding : XML.getChildren(handlerElement, "binding"))
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomProviderBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomProviderBuilder.java
index 534b07339ec..50d0f1c5ff0 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomProviderBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomProviderBuilder.java
@@ -49,13 +49,11 @@ public class DomProviderBuilder extends DomGenericTargetBuilder<Provider> {
         final Integer certificateTtl;
         final Integer certificateRetryWait;
         final Node certificateProxy;  // Just re-using the Node class, as it matches our needs
-        final Integer cacheSizeMB;
 
         ProviderReader(Element providerElement) {
             type = readType(providerElement);
             path = readPath(providerElement);
             cacheWeight = readCacheWeight(providerElement);
-            cacheSizeMB = readCacheSize(providerElement);
             clusterName = readCluster(providerElement);
             readTimeout = readReadTimeout(providerElement);
             connectionTimeout = readConnectionTimeout(providerElement);
@@ -68,7 +66,6 @@ public class DomProviderBuilder extends DomGenericTargetBuilder<Provider> {
             certificateProxy = readCertificateProxy(providerElement);
         }
 
-
         private String getAttributeOrNull(Element element, String name) {
             String value = element.getAttribute(name);
             return value.isEmpty() ? null : value;
@@ -87,11 +84,6 @@ public class DomProviderBuilder extends DomGenericTargetBuilder<Provider> {
             return (cacheWeightString == null)? null : Double.parseDouble(cacheWeightString);
         }
 
-        private Integer readCacheSize(Element providerElement) {
-            String cacheSize = getAttributeOrNull(providerElement, "cachesize");
-            return (cacheSize == null)? null : (int)BinaryScaledAmountParser.parse(cacheSize).as(BinaryPrefix.mega);
-        }
-
         private Integer readRetries(Element providerElement) {
             String retriesString = getAttributeOrNull(providerElement, "retries");
             return (retriesString == null) ? null : Integer.parseInt(retriesString);
@@ -205,8 +197,8 @@ public class DomProviderBuilder extends DomGenericTargetBuilder<Provider> {
 
     @SuppressWarnings("deprecation")
     private Provider buildProvider(ChainSpecification specWithoutInnerSearchers,
-                                   ProviderReader providerReader, FederationOptions federationOptions) {
-
+                                   ProviderReader providerReader,
+                                   FederationOptions federationOptions) {
         if (providerReader.type == null) {
             return new GenericProvider(specWithoutInnerSearchers, federationOptions);
         } else if (LocalProviderSpec.includesType(providerReader.type)) {
@@ -216,16 +208,26 @@ public class DomProviderBuilder extends DomGenericTargetBuilder<Provider> {
         }
     }
 
-    private Provider buildLocalProvider(ChainSpecification specWithoutInnerSearchers, ProviderReader providerReader, FederationOptions federationOptions) {
+    private Provider buildLocalProvider(ChainSpecification specWithoutInnerSearchers,
+                                        ProviderReader providerReader,
+                                        FederationOptions federationOptions) {
         try {
-            ensureEmpty(specWithoutInnerSearchers.componentId, providerReader.cacheWeight, providerReader.path, providerReader.nodes,
-                        providerReader.readTimeout, providerReader.connectionTimeout, providerReader.connectionPoolTimeout,
-                        providerReader.retries, providerReader.certificateApplicationId, providerReader.certificateTtl,
-                        providerReader.certificateRetryWait, providerReader.certificateProxy);
+            ensureEmpty(specWithoutInnerSearchers.componentId,
+                        providerReader.cacheWeight,
+                        providerReader.path,
+                        providerReader.nodes,
+                        providerReader.readTimeout,
+                        providerReader.connectionTimeout,
+                        providerReader.connectionPoolTimeout,
+                        providerReader.retries,
+                        providerReader.certificateApplicationId,
+                        providerReader.certificateTtl,
+                        providerReader.certificateRetryWait,
+                        providerReader.certificateProxy);
 
             return new LocalProvider(specWithoutInnerSearchers,
-                    federationOptions,
-                    new LocalProviderSpec(providerReader.clusterName, providerReader.cacheSizeMB));
+                                     federationOptions,
+                                     new LocalProviderSpec(providerReader.clusterName));
         } catch (Exception e) {
             throw new RuntimeException("Failed creating local provider " + specWithoutInnerSearchers.componentId, e);
         }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java
index 51f526d5efd..ef2eaeb4654 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java
@@ -74,20 +74,6 @@ public class ContainerSearch extends ContainerSubsystem<SearchChains>
     // public for testing
     public void initializeSearchChains(Map<String, ? extends AbstractSearchCluster> searchClusters) {
         getChains().initialize(searchClusters);
-
-        QrsCache defaultCacheOptions = getOptions().cacheSettings.get("");
-        if (defaultCacheOptions != null) {
-            for (LocalProvider localProvider : getChains().localProviders()) {
-                localProvider.setCacheSize(defaultCacheOptions.size);
-            }
-        }
-
-        for (LocalProvider localProvider : getChains().localProviders()) {
-            QrsCache cacheOptions = getOptions().cacheSettings.get(localProvider.getClusterName());
-            if (cacheOptions != null) {
-                localProvider.setCacheSize(cacheOptions.size);
-            }
-        }
     }
 
     public void setQueryProfiles(QueryProfiles queryProfiles) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java
index 4ecc666a9f2..cf3fd6ec3bd 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java
@@ -41,9 +41,6 @@ public class LocalProvider extends Provider implements
         builder.clusterId(searchCluster.getClusterIndex());
         builder.clusterName(searchCluster.getClusterName());
 
-        if (providerSpec.cacheSize != null)
-            builder.cacheSize(providerSpec.cacheSize);
-
         if (searchCluster.getVisibilityDelay() != null)
             builder.cacheTimeout(convertVisibilityDelay(searchCluster.getVisibilityDelay()));
     }
@@ -140,13 +137,6 @@ public class LocalProvider extends Provider implements
         searchCluster.getConfig(builder);
     }
 
-    /**
-     * For backward compatibility only, do not use.
-     */
-    public void setCacheSize(Integer cacheSize) {
-        providerSpec.cacheSize = cacheSize;
-    }
-
     // The semantics of visibility delay in search is deactivating caches if the
     // delay is less than 1.0, in qrs the cache is deactivated if the delay is 0
     // (or less). 1.0 seems a little arbitrary, so just doing the conversion
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/defaultsearchchains/LocalClustersCreator.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/defaultsearchchains/LocalClustersCreator.java
index a1b14017743..2f699f84623 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/defaultsearchchains/LocalClustersCreator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/defaultsearchchains/LocalClustersCreator.java
@@ -12,6 +12,7 @@ import com.yahoo.vespa.model.container.search.searchchain.SearchChains;
 
 import java.util.Collections;
 import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -19,17 +20,18 @@ import java.util.Set;
  * @author Tony Vaagenes
  */
 public class LocalClustersCreator {
+
     static ChainSpecification emptySearchChainSpecification(String componentName) {
-        return new ChainSpecification(
-                new ComponentId(componentName),
-                VespaSearchChainsCreator.inheritsVespaPhases(), //TODO: refactor
-                Collections.<Phase>emptyList(),
-                Collections.<ComponentSpecification>emptySet());
+        return new ChainSpecification(new ComponentId(componentName),
+                                      VespaSearchChainsCreator.inheritsVespaPhases(), //TODO: refactor
+                                      List.of(),
+                                      Set.of());
     }
 
     static LocalProvider createDefaultLocalProvider(String clusterName) {
-        return new LocalProvider(emptySearchChainSpecification(clusterName), new FederationOptions(),
-                new LocalProviderSpec(clusterName, null));
+        return new LocalProvider(emptySearchChainSpecification(clusterName),
+                                 new FederationOptions(),
+                                 new LocalProviderSpec(clusterName));
     }
 
     static Set<String> presentClusters(SearchChains searchChains) {
@@ -48,4 +50,5 @@ public class LocalClustersCreator {
             searchChains.add(createDefaultLocalProvider(clusterName));
         }
     }
+
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/ClusterControllerConfig.java b/config-model/src/main/java/com/yahoo/vespa/model/content/ClusterControllerConfig.java
index 43ef37d311d..882e56b82a3 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/ClusterControllerConfig.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/ClusterControllerConfig.java
@@ -16,7 +16,7 @@ import org.w3c.dom.Element;
  *
  * TODO: Author
  */
-public class ClusterControllerConfig extends AbstractConfigProducer implements FleetcontrollerConfig.Producer {
+public class ClusterControllerConfig extends AbstractConfigProducer<ClusterControllerConfig> implements FleetcontrollerConfig.Producer {
 
     public static class Builder extends VespaDomBuilder.DomConfigProducerBuilder<ClusterControllerConfig> {
         String clusterName;
@@ -28,7 +28,7 @@ public class ClusterControllerConfig extends AbstractConfigProducer implements F
         }
 
         @Override
-        protected ClusterControllerConfig doBuild(DeployState deployState, AbstractConfigProducer ancestor, Element producerSpec) {
+        protected ClusterControllerConfig doBuild(DeployState deployState, AbstractConfigProducer<?> ancestor, Element producerSpec) {
             ModelElement tuning = null;
 
             ModelElement clusterTuning = clusterElement.child("tuning");
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java
index 11e6301c4b2..79b98837238 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java
@@ -42,7 +42,7 @@ import static java.util.stream.Collectors.toList;
  * Encapsulates the various options for search in a content model.
  * Wraps a search cluster from com.yahoo.vespa.model.search.
  */
-public class ContentSearchCluster extends AbstractConfigProducer implements ProtonConfig.Producer, DispatchConfig.Producer {
+public class ContentSearchCluster extends AbstractConfigProducer<SearchCluster> implements ProtonConfig.Producer, DispatchConfig.Producer {
 
     private final boolean flushOnShutdown;
 
@@ -88,7 +88,7 @@ public class ContentSearchCluster extends AbstractConfigProducer implements Prot
         }
 
         @Override
-        protected ContentSearchCluster doBuild(DeployState deployState, AbstractConfigProducer ancestor, Element producerSpec) {
+        protected ContentSearchCluster doBuild(DeployState deployState, AbstractConfigProducer<?> ancestor, Element producerSpec) {
             ModelElement clusterElem = new ModelElement(producerSpec);
             String clusterName = ContentCluster.getClusterId(clusterElem);
             Boolean flushOnShutdownElem = clusterElem.childAsBoolean("engine.proton.flush-on-shutdown");
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/generic/builder/DomModuleBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/generic/builder/DomModuleBuilder.java
index 212363c6667..63b5dc293ab 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/generic/builder/DomModuleBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/generic/builder/DomModuleBuilder.java
@@ -12,6 +12,7 @@ import org.w3c.dom.Element;
  * Produces sub services for generic services.
  */
 public class DomModuleBuilder extends VespaDomBuilder.DomConfigProducerBuilder<Module> {
+
     private final String name;
 
     public DomModuleBuilder(String name) {
@@ -25,7 +26,7 @@ public class DomModuleBuilder extends VespaDomBuilder.DomConfigProducerBuilder<M
     }
 
     @Override
-    protected Module doBuild(DeployState deployState, AbstractConfigProducer ancestor, Element subServiceSpec) {
+    protected Module doBuild(DeployState deployState, AbstractConfigProducer<?> ancestor, Element subServiceSpec) {
         Module s = new Module(ancestor, name);
         addChildren(deployState, s, subServiceSpec);
         return s;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/generic/builder/DomServiceClusterBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/generic/builder/DomServiceClusterBuilder.java
index 200a1d175a3..6aa6bc80754 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/generic/builder/DomServiceClusterBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/generic/builder/DomServiceClusterBuilder.java
@@ -11,18 +11,17 @@ import java.util.Map;
 
 /**
 * @author Ulf Lilleengen
-* @since 5.1
 */
 public class DomServiceClusterBuilder extends VespaDomBuilder.DomConfigProducerBuilder<ServiceCluster> {
 
-    private String name;
+    private final String name;
 
     public DomServiceClusterBuilder(String name) {
         this.name = name;
     }
 
     @Override
-    protected ServiceCluster doBuild(DeployState deployState, AbstractConfigProducer ancestor, Element spec) {
+    protected ServiceCluster doBuild(DeployState deployState, AbstractConfigProducer<?> ancestor, Element spec) {
         ServiceCluster cluster = new ServiceCluster(ancestor, name, spec.getAttribute("command"));
         int nodeIndex = 0;
         for (Element nodeSpec : XML.getChildren(spec, "node")) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/generic/service/Module.java b/config-model/src/main/java/com/yahoo/vespa/model/generic/service/Module.java
index 5c81f50fd02..9b7d9d65b74 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/generic/service/Module.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/generic/service/Module.java
@@ -10,9 +10,9 @@ import com.yahoo.config.model.producer.AbstractConfigProducer;
  *
  * @author Ulf Lilleengen
  */
-public class Module extends AbstractConfigProducer {
+public class Module extends AbstractConfigProducer<Module> {
 
-    public Module(AbstractConfigProducer parent, String subId) {
+    public Module(AbstractConfigProducer<?> parent, String subId) {
         super(parent, subId);
     }
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/generic/service/ServiceCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/generic/service/ServiceCluster.java
index 7d304968bc7..e71459723a1 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/generic/service/ServiceCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/generic/service/ServiceCluster.java
@@ -12,14 +12,14 @@ import java.util.Collection;
  * @author vegardh
  *
  */
-public class ServiceCluster extends AbstractConfigProducer {
+public class ServiceCluster extends AbstractConfigProducer<ServiceCluster> {
 
     private static final long serialVersionUID = 1L;
-    private String command;
-    private String name;
+    private final String command;
+    private final String name;
     private HostSystem hostSystem; // A generic cluster can resolve hosts for its nodes
 
-    public ServiceCluster(AbstractConfigProducer parent, String name, String command) {
+    public ServiceCluster(AbstractConfigProducer<?> parent, String name, String command) {
         super(parent, name);
         this.command=command;
         this.name=name;