1 files changed, 8 insertions, 17 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/routing/DocumentProtocol.java b/config-model/src/main/java/com/yahoo/vespa/model/routing/DocumentProtocol.java
index d555d13c09c..1c8567b4079 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/routing/DocumentProtocol.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/routing/DocumentProtocol.java
@@ -110,11 +110,7 @@ public final class DocumentProtocol implements Protocol,
         for (ContentCluster cluster : Content.getContentClusters(repo)) {
             DocumentProtocolPoliciesConfig.Cluster.Builder clusterBuilder = new DocumentProtocolPoliciesConfig.Cluster.Builder();
             addSelector(cluster.getConfigId(), cluster.getRoutingSelector(), clusterBuilder);
-            if (cluster.getSearch().getIndexingDocproc().isPresent())
-                addRoutes(getDirectRouteName(cluster.getConfigId()), getIndexedRouteName(cluster.getConfigId()), clusterBuilder);
-            else
-                clusterBuilder.defaultRoute(cluster.getConfigId());
-
+            addRoutes(getDirectRouteName(cluster.getConfigId()), getIndexedRouteName(cluster.getConfigId()), clusterBuilder);
             builder.cluster(cluster.getConfigId(), clusterBuilder);
         }
     }
@@ -226,18 +222,13 @@ public final class DocumentProtocol implements Protocol,
     private static void addContentRouting(List<ContentCluster> content, RoutingTableSpec table) {
         for (ContentCluster cluster : content) {
             RouteSpec spec = new RouteSpec(cluster.getConfigId());
-
-            if (cluster.getSearch().getIndexingDocproc().isPresent()) {
-                var indexingDocproc = cluster.getSearch().getIndexingDocproc().get();
-                table.addRoute(spec.addHop("[MessageType:" + cluster.getConfigId() + "]"));
-                table.addRoute(new RouteSpec(getIndexedRouteName(cluster.getConfigId()))
-                                       .addHop(indexingDocproc.getServiceName())
-                                       .addHop("[Content:cluster=" + cluster.getName() + "]"));
-                table.addRoute(new RouteSpec(getDirectRouteName(cluster.getConfigId()))
-                                       .addHop("[Content:cluster=" + cluster.getName() + "]"));
-            } else {
-                table.addRoute(spec.addHop("[Content:cluster=" + cluster.getName() + "]"));
-            }
+            var indexingDocproc = cluster.getSearch().getIndexingDocproc();
+            table.addRoute(spec.addHop("[MessageType:" + cluster.getConfigId() + "]"));
+            table.addRoute(new RouteSpec(getIndexedRouteName(cluster.getConfigId()))
+                                   .addHop(indexingDocproc.getServiceName())
+                                   .addHop("[Content:cluster=" + cluster.getName() + "]"));
+            table.addRoute(new RouteSpec(getDirectRouteName(cluster.getConfigId()))
+                                   .addHop("[Content:cluster=" + cluster.getName() + "]"));
             table.addRoute(new RouteSpec("storage/cluster." + cluster.getName())
                                    .addHop("route:" + cluster.getConfigId()));
         }