From 4ddf0c7f069fe9d125b39eba44332b9027a91c2a Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Sun, 22 Sep 2019 09:03:04 +0200
Subject: Clean up the dispatch protobuf flag too.

---
 .../src/main/java/com/yahoo/config/model/deploy/TestProperties.java    | 3 +--
 .../main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java   | 3 ---
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'config-model/src/main/java')

diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
index 8873a2c33c0..1a11555a910 100644
--- a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
+++ b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
@@ -38,7 +38,6 @@ public class TestProperties implements ModelContext.Properties {
     private boolean isBootstrap = false;
     private boolean isFirstTimeDeployment = false;
     private boolean useDedicatedNodeForLogserver = false;
-    private boolean dispatchWithProtobuf = true;
     private boolean useAdaptiveDispatch = false;
     private double defaultTermwiseLimit = 1.0;
     private Optional<TlsSecrets> tlsSecrets = Optional.empty();
@@ -60,7 +59,7 @@ public class TestProperties implements ModelContext.Properties {
     @Override public boolean useAdaptiveDispatch() { return useAdaptiveDispatch; }
     @Override public boolean useDedicatedNodeForLogserver() { return useDedicatedNodeForLogserver; }
     @Override public boolean useFdispatchByDefault() { return false; }
-    @Override public boolean dispatchWithProtobuf() { return dispatchWithProtobuf; }
+    @Override public boolean dispatchWithProtobuf() { return true; }
     @Override public Optional<TlsSecrets> tlsSecrets() { return tlsSecrets; }
     @Override public double defaultTermwiseLimit() { return defaultTermwiseLimit; }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java
index 7361340100d..76617bf1b9f 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java
@@ -106,7 +106,6 @@ public class IndexedSearchCluster extends SearchCluster
     private final SimpleConfigProducer dispatchParent;
     private final DispatchGroup rootDispatch;
     private DispatchSpec dispatchSpec;
-    private final boolean dispatchWithProtobuf;
     private final boolean useAdaptiveDispatch;
     private List<SearchNode> searchNodes = new ArrayList<>();
 
@@ -125,7 +124,6 @@ public class IndexedSearchCluster extends SearchCluster
         unionCfg = new UnionConfiguration(this, documentDbs);
         dispatchParent = new SimpleConfigProducer(this, "dispatchers");
         rootDispatch =  new DispatchGroup(this);
-        dispatchWithProtobuf = deployState.getProperties().dispatchWithProtobuf();
         useAdaptiveDispatch = deployState.getProperties().useAdaptiveDispatch();
     }
 
@@ -438,7 +436,6 @@ public class IndexedSearchCluster extends SearchCluster
         }
         builder.maxNodesDownPerGroup(rootDispatch.getMaxNodesDownPerFixedRow());
         builder.useMultilevelDispatch(useMultilevelDispatchSetup());
-        builder.dispatchWithProtobuf(dispatchWithProtobuf);
         builder.useLocalNode(tuning.dispatch.useLocalNode);
         builder.searchableCopies(rootDispatch.getSearchableCopies());
         if (searchCoverage != null) {
-- 
cgit v1.2.3