diff options
3 files changed, 2 insertions, 10 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java index 85be1272a55..8addd6d3b6c 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java @@ -54,8 +54,8 @@ public interface ModelContext { boolean isBootstrap(); boolean isFirstTimeDeployment(); boolean useDedicatedNodeForLogserver(); - boolean useFdispatchByDefault(); // TODO Remove once 7.110 is the oldest old config models - boolean dispatchWithProtobuf(); // TODO Remove once 7.110 is the oldest old config models + default boolean useFdispatchByDefault() { return false; } // TODO Remove once 7.111 is the oldest old config models + default boolean dispatchWithProtobuf() { return true; } // TODO Remove once 7.111 is the oldest old config models boolean useAdaptiveDispatch(); // TODO: Remove temporary default implementation default Optional<TlsSecrets> tlsSecrets() { return Optional.empty(); } 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 1a11555a910..c304e7efa09 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 @@ -58,8 +58,6 @@ public class TestProperties implements ModelContext.Properties { @Override public boolean isFirstTimeDeployment() { return isFirstTimeDeployment; } @Override public boolean useAdaptiveDispatch() { return useAdaptiveDispatch; } @Override public boolean useDedicatedNodeForLogserver() { return useDedicatedNodeForLogserver; } - @Override public boolean useFdispatchByDefault() { return false; } - @Override public boolean dispatchWithProtobuf() { return true; } @Override public Optional<TlsSecrets> tlsSecrets() { return tlsSecrets; } @Override public double defaultTermwiseLimit() { return defaultTermwiseLimit; } 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 f681bf819f0..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 @@ -215,12 +215,6 @@ public class ModelContextImpl implements ModelContext { public boolean useDedicatedNodeForLogserver() { return useDedicatedNodeForLogserver; } @Override - public boolean useFdispatchByDefault() { return false; } - - @Override - public boolean dispatchWithProtobuf() { return true; } - - @Override public boolean useAdaptiveDispatch() { return useAdaptiveDispatch; } @Override |