Merge pull request #10758 from vespa-engine/balder/remove-fdispatch-flag

Fdispatch is now gone - no mor eneed for this flag.

1 files changed, 0 insertions, 12 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
index 2b36f3496fe..48f5618886b 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
@@ -132,9 +132,7 @@ public class ModelContextImpl implements ModelContext {
         private final boolean isBootstrap;
         private final boolean isFirstTimeDeployment;
         private final boolean useDedicatedNodeForLogserver;
-        private final boolean useFdispatchByDefault;
         private final boolean useAdaptiveDispatch;
-        private final boolean dispatchWithProtobuf;
         private final Optional<TlsSecrets> tlsSecrets;
         private final double defaultTermwiseLimit;
 
@@ -166,10 +164,6 @@ public class ModelContextImpl implements ModelContext {
             this.isFirstTimeDeployment = isFirstTimeDeployment;
             this.useDedicatedNodeForLogserver = Flags.USE_DEDICATED_NODE_FOR_LOGSERVER.bindTo(flagSource)
                     .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value();
-            this.useFdispatchByDefault = Flags.USE_FDISPATCH_BY_DEFAULT.bindTo(flagSource)
-                    .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value();
-            this.dispatchWithProtobuf = Flags.DISPATCH_WITH_PROTOBUF.bindTo(flagSource)
-                    .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value();
             this.useAdaptiveDispatch = Flags.USE_ADAPTIVE_DISPATCH.bindTo(flagSource)
                     .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value();
             this.tlsSecrets = tlsSecrets;
@@ -221,12 +215,6 @@ public class ModelContextImpl implements ModelContext {
         public boolean useDedicatedNodeForLogserver() { return useDedicatedNodeForLogserver; }
 
         @Override
-        public boolean useFdispatchByDefault() { return useFdispatchByDefault; }
-
-        @Override
-        public boolean dispatchWithProtobuf() { return dispatchWithProtobuf; }
-
-        @Override
         public boolean useAdaptiveDispatch() { return useAdaptiveDispatch; }
 
         @Override