Move constant

2 files changed, 4 insertions, 5 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModel.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModel.java
index 62b326de2df..b819752224a 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModel.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModel.java
@@ -24,9 +24,6 @@ import java.util.TreeMap;
  */
 public class ContainerModel extends ConfigModel {
 
-    // TODO: Move to referer
-    public static final String DOCPROC_RESERVED_NAME = "docproc";
-
     private ContainerCluster<? extends Container> containerCluster;
 
     public ContainerModel(ConfigModelContext context) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java b/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java
index fc2f68ccd92..a0053b839c2 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java
@@ -48,6 +48,8 @@ import java.util.Set;
  */
 public class Content extends ConfigModel {
 
+    private static final String DOCPROC_RESERVED_NAME = "docproc";
+
     private ContentCluster cluster;
     private Optional<ApplicationContainerCluster> ownedIndexingCluster = Optional.empty();
 
@@ -288,9 +290,9 @@ public class Content extends ConfigModel {
                                                    ConfigModelContext modelContext,
                                                    ApplicationConfigProducerRoot root) {
             String indexerName = cluster.getIndexingClusterName();
-            AbstractConfigProducer<?> parent = root.getChildren().get(ContainerModel.DOCPROC_RESERVED_NAME);
+            AbstractConfigProducer<?> parent = root.getChildren().get(DOCPROC_RESERVED_NAME);
             if (parent == null)
-                parent = new SimpleConfigProducer(root, ContainerModel.DOCPROC_RESERVED_NAME);
+                parent = new SimpleConfigProducer(root, DOCPROC_RESERVED_NAME);
             ApplicationContainerCluster indexingCluster = new ApplicationContainerCluster(parent, "cluster." + indexerName, indexerName, modelContext.getDeployState());
             ContainerModel indexingClusterModel = new ContainerModel(modelContext.withParent(parent).withId(indexingCluster.getSubId()));
             indexingClusterModel.setCluster(indexingCluster);