Remove unnecessary instances of the character sequence 'yca'

4 files changed, 26 insertions, 26 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 91a46c25384..198824ea9fb 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
@@ -64,10 +64,10 @@ public class DomProviderBuilder extends DomGenericTargetBuilder<Provider> {
             connectionPoolTimeout = readConnectionPoolTimeout(providerElement);
             retries = readRetries(providerElement);
             nodes = readNodes(providerElement);
-            ycaApplicationId = readYcaApplicationId(providerElement);
-            ycaTtl = readYcaTtl(providerElement);
-            ycaRetryWait = readYcaRetryWait(providerElement);
-            ycaProxy = readYcaProxy(providerElement);
+            ycaApplicationId = readCertificateApplicationId(providerElement);
+            ycaTtl = readCertificateTtl(providerElement);
+            ycaRetryWait = readCertificateRetryWait(providerElement);
+            ycaProxy = readCertificateProxy(providerElement);
         }
 
 
@@ -114,29 +114,29 @@ public class DomProviderBuilder extends DomGenericTargetBuilder<Provider> {
             return (timeoutString == null) ? null : TimeParser.seconds(timeoutString);
         }
 
-        private String readYcaApplicationId(Element providerElement) {
+        private String readCertificateApplicationId(Element providerElement) {
             return getAttributeOrNull(providerElement, "yca-application-id");
         }
 
-        private Integer readYcaTtl(Element providerElement) {
+        private Integer readCertificateTtl(Element providerElement) {
             String x = getAttributeOrNull(providerElement, "yca-cache-ttl");
             return (x == null) ? null : TimeParser.seconds(x).intValue();
         }
 
-        private Integer readYcaRetryWait(Element providerElement) {
+        private Integer readCertificateRetryWait(Element providerElement) {
             String x = getAttributeOrNull(providerElement, "yca-cache-retry-wait");
             return (x == null) ? null : TimeParser.seconds(x).intValue();
         }
 
-        private HttpProviderSpec.Node readYcaProxy(Element providerElement) {
-            Element ycaProxySpec = XML.getChild(providerElement, "yca-proxy");
-            if (ycaProxySpec == null) {
+        private HttpProviderSpec.Node readCertificateProxy(Element providerElement) {
+            Element certificateProxySpec = XML.getChild(providerElement, "yca-proxy");
+            if (certificateProxySpec == null) {
                 return null; // no proxy
             }
-            if(getAttributeOrNull(ycaProxySpec, "host") == null) {
+            if(getAttributeOrNull(certificateProxySpec, "host") == null) {
                 return new HttpProviderSpec.Node(null, 0); // default proxy
             }
-            return readNode(ycaProxySpec);
+            return readNode(certificateProxySpec);
         }
 
         private List<HttpProviderSpec.Node> readNodes(Element providerElement) {
@@ -177,7 +177,7 @@ public class DomProviderBuilder extends DomGenericTargetBuilder<Provider> {
         if (providerReader.ycaApplicationId == null && providerReader.ycaProxy != null) {
             throw new IllegalArgumentException(
                     "Provider '" + specWithoutInnerComponents.componentId +
-                            "' must have a YCA application ID, since a YCA proxy is given");
+                            "' must have a certificate application ID, since a certificate store proxy is given");
         }
 
         FederationOptions federationOptions = readFederationOptions(providerElement);
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/component/HttpFilter.java b/config-model/src/main/java/com/yahoo/vespa/model/container/component/HttpFilter.java
index a016b5ada44..e943da41dd3 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/component/HttpFilter.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/component/HttpFilter.java
@@ -8,7 +8,7 @@ import com.yahoo.container.bundle.BundleInstantiationSpecification;
 import com.yahoo.osgi.provider.model.ComponentModel;
 
 /**
- * This is only for the legacy yca filter setup, outside http.
+ * This is only for the legacy certificate filter setup, outside http.
  *
  * TODO: Remove when 'filter' directly under 'jdisc' can be removed from services.xml
  *
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/HttpProvider.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/HttpProvider.java
index 22ed9b881b7..0dcd45e4e64 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/HttpProvider.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/HttpProvider.java
@@ -66,24 +66,24 @@ public class HttpProvider extends Provider implements ProviderConfig.Producer,
         builder.node(getNodes(providerSpec.nodes));
 
         if (providerSpec.ycaApplicationId != null) {
-            builder.yca(getYca(providerSpec));
+            builder.yca(getCertificate(providerSpec));
         }
     }
 
-    private static Yca.Builder getYca(HttpProviderSpec providerSpec) {
-        Yca.Builder yca = new Yca.Builder()
+    private static Yca.Builder getCertificate(HttpProviderSpec providerSpec) {
+        Yca.Builder certificate = new Yca.Builder()
                 .applicationId(providerSpec.ycaApplicationId);
 
         if (providerSpec.ycaProxy != null) {
-            yca.useProxy(true);
+            certificate.useProxy(true);
             if (providerSpec.ycaProxy.host != null) {
-                yca.host(providerSpec.ycaProxy.host)
+                certificate.host(providerSpec.ycaProxy.host)
                         .port(providerSpec.ycaProxy.port);
             }
         }
-        if (providerSpec.ycaCertificateTtl != null) yca.ttl(providerSpec.ycaCertificateTtl);
-        if (providerSpec.ycaRetryWait != null) yca.ttl(providerSpec.ycaRetryWait);
-        return yca;
+        if (providerSpec.ycaCertificateTtl != null) certificate.ttl(providerSpec.ycaCertificateTtl);
+        if (providerSpec.ycaRetryWait != null) certificate.ttl(providerSpec.ycaRetryWait);
+        return certificate;
     }
 
     private static List<Node.Builder> getNodes(List<HttpProviderSpec.Node> nodeSpecs) {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomProviderBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomProviderBuilderTest.java
index b7df93fbc0c..81eeeea42ee 100755
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomProviderBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomProviderBuilderTest.java
@@ -57,7 +57,7 @@ public class DomProviderBuilderTest extends DomBuilderTest {
     private Provider provider;
 
     @Test
-    public void testYcaConfig_noProxy() {
+    public void testCertificateConfig_noProxy() {
         provider = new DomProviderBuilder(new HashMap<String, ComponentsBuilder.ComponentType>()).doBuild(root, noProxy);
 
         ChainedComponent providerSearcher = provider.getInnerComponents().iterator().next();
@@ -71,7 +71,7 @@ public class DomProviderBuilderTest extends DomBuilderTest {
     }
 
     @Test
-    public void testYcaConfig_defaultProxy() {
+    public void testCertificatewConfig_defaultProxy() {
         provider = new DomProviderBuilder(new HashMap<String, ComponentsBuilder.ComponentType>()).doBuild(root, defaultProxy);
 
         ProviderConfig.Builder providerBuilder = new ProviderConfig.Builder();
@@ -85,7 +85,7 @@ public class DomProviderBuilderTest extends DomBuilderTest {
     }
 
     @Test
-    public void testYcaConfig_proprietaryProxy() {
+    public void testCertificateConfig_proprietaryProxy() {
         provider = new DomProviderBuilder(new HashMap<String, ComponentsBuilder.ComponentType>()).doBuild(root, proprietaryProxy);
 
         ProviderConfig.Builder providerBuilder = new ProviderConfig.Builder();
@@ -104,7 +104,7 @@ public class DomProviderBuilderTest extends DomBuilderTest {
             provider = new DomProviderBuilder(new HashMap<String, ComponentsBuilder.ComponentType>()).doBuild(root, illegal_proxyWithoutId);
             fail("Expected exception upon illegal xml.");
         } catch (IllegalArgumentException e) {
-            assertThat(e.getMessage(), is("Provider 'yca-provider' must have a YCA application ID, since a YCA proxy is given"));
+            assertThat(e.getMessage(), is("Provider 'yca-provider' must have a certificate application ID, since a certificate store proxy is given"));
         }
     }