summaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2018-10-03 17:48:50 +0200
committerHenning Baldersheim <balder@yahoo-inc.com>2018-10-03 17:48:50 +0200
commit8b3a191ab75edf301ed71f21a752bfd9ec69be4c (patch)
tree905a8de7d8a28c4b739ca023cf93847a91403539 /config-model
parenteeb026485facec9dd276986b4a4297f51490d902 (diff)
No .* imports.
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java16
1 files changed, 10 insertions, 6 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java
index 54e1f2bf6b2..5b7d1fe010c 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java
@@ -1,8 +1,10 @@
// 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.*;
import com.yahoo.config.application.api.ApplicationPackage;
+import com.yahoo.config.model.ApplicationConfigProducerRoot;
+import com.yahoo.config.model.ConfigModel;
+import com.yahoo.config.model.ConfigModelRepo;
import com.yahoo.config.model.api.HostProvisioner;
import com.yahoo.config.model.deploy.DeployProperties;
import com.yahoo.config.model.deploy.DeployState;
@@ -13,7 +15,11 @@ import com.yahoo.config.model.producer.UserConfigRepo;
import com.yahoo.log.LogLevel;
import com.yahoo.text.XML;
import com.yahoo.vespa.documentmodel.DocumentModel;
-import com.yahoo.vespa.model.*;
+import com.yahoo.vespa.model.AbstractService;
+import com.yahoo.vespa.model.Affinity;
+import com.yahoo.vespa.model.Client;
+import com.yahoo.vespa.model.HostSystem;
+import com.yahoo.vespa.model.SimpleConfigProducer;
import com.yahoo.vespa.model.builder.UserConfigBuilder;
import com.yahoo.vespa.model.builder.VespaModelBuilder;
import com.yahoo.vespa.model.container.ContainerCluster;
@@ -211,8 +217,7 @@ public class VespaDomBuilder extends VespaModelBuilder {
}
@Override
- protected SimpleConfigProducer doBuild(AbstractConfigProducer parent,
- Element producerSpec) {
+ protected SimpleConfigProducer doBuild(AbstractConfigProducer parent, Element producerSpec) {
return new SimpleConfigProducer(parent, configId);
}
}
@@ -321,8 +326,7 @@ public class VespaDomBuilder extends VespaModelBuilder {
}
@Override
- public List<ServiceCluster> getClusters(ApplicationPackage pkg,
- AbstractConfigProducer parent) {
+ public List<ServiceCluster> getClusters(ApplicationPackage pkg, AbstractConfigProducer parent) {
List<ServiceCluster> clusters = new ArrayList<>();
Document services = XmlHelper.getDocument(pkg.getServices());
for (Element clusterSpec : XML.getChildren(services.getDocumentElement(), "cluster")) {