summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2022-01-03 12:14:13 +0100
committergjoranv <gv@verizonmedia.com>2022-01-03 12:20:37 +0100
commit5716534cc1023a77b793e421e750ccd6c40a42ec (patch)
treec72d457a83e94188c911e3c3c9957a69d5f917c4
parent28ae61202ad963955cf92719bab9b9d97181d5dd (diff)
Deprecate the 'service' element in services.xml
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/generic/GenericServicesBuilder.java4
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/generic/builder/DomServiceClusterBuilder.java10
2 files changed, 11 insertions, 3 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/generic/GenericServicesBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/generic/GenericServicesBuilder.java
index 77acffe7f9d..7a0278faa48 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/generic/GenericServicesBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/generic/GenericServicesBuilder.java
@@ -13,6 +13,8 @@ import java.util.List;
/**
* @author Ulf Lilleengen
* @since 5.1
+ *
+ * TODO: remove in Vespa 8
*/
public class GenericServicesBuilder extends ConfigModelBuilder<GenericServicesModel> {
@@ -22,7 +24,7 @@ public class GenericServicesBuilder extends ConfigModelBuilder<GenericServicesMo
@Override
public List<ConfigModelId> handlesElements() {
- return Arrays.asList(ConfigModelId.fromName("service"));
+ return List.of(ConfigModelId.fromName("service"));
}
@Override
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 ea2151648cc..1ac668049f0 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
@@ -8,10 +8,13 @@ import com.yahoo.vespa.model.builder.xml.dom.VespaDomBuilder;
import com.yahoo.vespa.model.generic.service.ServiceCluster;
import org.w3c.dom.Element;
import java.util.Map;
+import java.util.logging.Level;
/**
-* @author Ulf Lilleengen
-*/
+ * @author Ulf Lilleengen
+ *
+ * TODO: remove in Vespa 8
+ */
public class DomServiceClusterBuilder extends VespaDomBuilder.DomConfigProducerBuilder<ServiceCluster> {
private final String name;
@@ -22,6 +25,9 @@ public class DomServiceClusterBuilder extends VespaDomBuilder.DomConfigProducerB
@Override
protected ServiceCluster doBuild(DeployState deployState, AbstractConfigProducer<?> ancestor, Element spec) {
+ deployState.getDeployLogger().logApplicationPackage(
+ Level.WARNING, "The 'service' element is deprecated and will be removed in Vespa 8, without replacement.");
+
ServiceCluster cluster = new ServiceCluster(ancestor, name, spec.getAttribute("command"));
int nodeIndex = 0;
for (Element nodeSpec : XML.getChildren(spec, "node")) {