Merge branch 'master' into bratseth/remove-cacheSize

1 files changed, 2 insertions, 44 deletions

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 50d0f1c5ff0..1e6159ce9ca 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
@@ -36,6 +36,7 @@ public class DomProviderBuilder extends DomGenericTargetBuilder<Provider> {
      * Retrieves all possible provider specific parameters
      */
     private static class ProviderReader {
+
         final String type;
         final String path;
         final Double cacheWeight;
@@ -45,10 +46,6 @@ public class DomProviderBuilder extends DomGenericTargetBuilder<Provider> {
         final Double connectionPoolTimeout;
         final String clusterName;
         final List<Node> nodes;
-        final String certificateApplicationId;
-        final Integer certificateTtl;
-        final Integer certificateRetryWait;
-        final Node certificateProxy;  // Just re-using the Node class, as it matches our needs
 
         ProviderReader(Element providerElement) {
             type = readType(providerElement);
@@ -60,10 +57,6 @@ public class DomProviderBuilder extends DomGenericTargetBuilder<Provider> {
             connectionPoolTimeout = readConnectionPoolTimeout(providerElement);
             retries = readRetries(providerElement);
             nodes = readNodes(providerElement);
-            certificateApplicationId = readCertificateApplicationId(providerElement);
-            certificateTtl = readCertificateTtl(providerElement);
-            certificateRetryWait = readCertificateRetryWait(providerElement);
-            certificateProxy = readCertificateProxy(providerElement);
         }
 
         private String getAttributeOrNull(Element element, String name) {
@@ -104,31 +97,6 @@ public class DomProviderBuilder extends DomGenericTargetBuilder<Provider> {
             return (timeoutString == null) ? null : TimeParser.seconds(timeoutString);
         }
 
-        private String readCertificateApplicationId(Element providerElement) {
-            return getAttributeOrNull(providerElement, "yca-application-id");
-        }
-
-        private Integer readCertificateTtl(Element providerElement) {
-            String x = getAttributeOrNull(providerElement, "yca-cache-ttl");
-            return (x == null) ? null : TimeParser.seconds(x).intValue();
-        }
-
-        private Integer readCertificateRetryWait(Element providerElement) {
-            String x = getAttributeOrNull(providerElement, "yca-cache-retry-wait");
-            return (x == null) ? null : TimeParser.seconds(x).intValue();
-        }
-
-        private Node readCertificateProxy(Element providerElement) {
-            Element certificateProxySpec = XML.getChild(providerElement, "yca-proxy");
-            if (certificateProxySpec == null) {
-                return null; // no proxy
-            }
-            if(getAttributeOrNull(certificateProxySpec, "host") == null) {
-                return new Node(null, 0); // default proxy
-            }
-            return readNode(certificateProxySpec);
-        }
-
         private List<Node> readNodes(Element providerElement) {
             Element nodesSpec = XML.getChild(providerElement, "nodes");
             if (nodesSpec == null) {
@@ -164,12 +132,6 @@ public class DomProviderBuilder extends DomGenericTargetBuilder<Provider> {
                                   ChainSpecification specWithoutInnerComponents) {
 
         ProviderReader providerReader = new ProviderReader(providerElement);
-        if (providerReader.certificateApplicationId == null && providerReader.certificateProxy != null) {
-            throw new IllegalArgumentException(
-                    "Provider '" + specWithoutInnerComponents.componentId +
-                            "' must have a certificate application ID, since a certificate store proxy is given");
-        }
-
         FederationOptions federationOptions = readFederationOptions(providerElement);
 
         Provider provider = buildProvider(specWithoutInnerComponents, providerReader, federationOptions);
@@ -219,11 +181,7 @@ public class DomProviderBuilder extends DomGenericTargetBuilder<Provider> {
                         providerReader.readTimeout,
                         providerReader.connectionTimeout,
                         providerReader.connectionPoolTimeout,
-                        providerReader.retries,
-                        providerReader.certificateApplicationId,
-                        providerReader.certificateTtl,
-                        providerReader.certificateRetryWait,
-                        providerReader.certificateProxy);
+                        providerReader.retries);
 
             return new LocalProvider(specWithoutInnerSearchers,
                                      federationOptions,