diff options
author | Harald Musum <musum@yahoo-inc.com> | 2017-02-28 14:07:39 +0100 |
---|---|---|
committer | Harald Musum <musum@yahoo-inc.com> | 2017-02-28 14:07:39 +0100 |
commit | 15d245682f1d0a15e609e270c542c040efd4cdf2 (patch) | |
tree | cafd7a102cedd73b7c9bf78c05b562c5865010b8 /config-model/src/main/java | |
parent | c351c34c95c7e30a0122af2a6819d30b4e9fe556 (diff) |
Remove pointless method for creating link to doc
Diffstat (limited to 'config-model/src/main/java')
3 files changed, 2 insertions, 21 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/ConfigModelUtils.java b/config-model/src/main/java/com/yahoo/config/model/ConfigModelUtils.java index f64eee6e863..d5d57b3943c 100644 --- a/config-model/src/main/java/com/yahoo/config/model/ConfigModelUtils.java +++ b/config-model/src/main/java/com/yahoo/config/model/ConfigModelUtils.java @@ -1,16 +1,11 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.model; -import javax.xml.xpath.XPath; -import javax.xml.xpath.XPathExpressionException; -import javax.xml.xpath.XPathFactory; import java.io.Serializable; import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static javax.xml.xpath.XPathConstants.BOOLEAN; - import static com.yahoo.text.Lowercase.toLowerCase; /** @@ -51,14 +46,4 @@ public class ConfigModelUtils implements Serializable { return ConfigModelUtils.day2int.get(toLowerCase(day)); } - /** - * Create a string with link to documentation for latest release. - * - * @param filePath Relative path of the file to link to, e.g. reference/services-jdisc.html - * @return a String with link to documentation - */ - public static String createDocLink(String filePath) { - return filePath; - } - } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java index ff59d2abc96..851f8ce476b 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java @@ -2,7 +2,6 @@ package com.yahoo.vespa.model.builder.xml.dom; import com.yahoo.config.model.ConfigModelContext; -import com.yahoo.config.model.ConfigModelUtils; import com.yahoo.config.model.api.ConfigServerSpec; import com.yahoo.config.model.producer.AbstractConfigProducer; import com.yahoo.text.XML; @@ -58,8 +57,7 @@ public class DomAdminV2Builder extends DomAdminBuilderBase { int count = configservers.size(); if (count % 2 == 0) { admin.deployLogger().log(Level.WARNING, "An even number (" + count + ") of config servers have been configured. " + - "This is discouraged, see " + "" + - ConfigModelUtils.createDocLink("cloudconfig/configuration-server.html#fault-tolerance")); + "This is discouraged, see doc for configuration server "); } return configservers; } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java index c42f44b46f1..af975176461 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java @@ -3,7 +3,6 @@ package com.yahoo.vespa.model.content.cluster; import com.google.common.base.Preconditions; import com.google.common.collect.Sets; -import com.yahoo.config.model.ConfigModelUtils; import com.yahoo.config.model.producer.AbstractConfigProducerRoot; import com.yahoo.config.provision.ClusterSpec; import com.yahoo.config.application.api.DeployLogger; @@ -290,8 +289,7 @@ public class ContentCluster extends AbstractConfigProducer implements StorDistri if (clusterControllers == null) { List<HostResource> hosts = admin.getClusterControllerHosts(); if (hosts.size() > 1) { - admin.deployLogger().log(Level.INFO, "When having content cluster(s) and more than 1 config server it is recommended to configure cluster controllers explicitly." + - " See " + ConfigModelUtils.createDocLink("reference/services-admin.html#cluster-controller")); + admin.deployLogger().log(Level.INFO, "When having content cluster(s) and more than 1 config server it is recommended to configure cluster controllers explicitly."); } clusterControllers = createClusterControllers(admin, hosts, "cluster-controllers", false); admin.setClusterControllers(clusterControllers); |