diff options
5 files changed, 9 insertions, 1 deletions
diff --git a/configdefinitions/src/vespa/routing-provider.def b/configdefinitions/src/vespa/routing-provider.def index 10d7be11e4d..eedf4f3c86f 100755 --- a/configdefinitions/src/vespa/routing-provider.def +++ b/configdefinitions/src/vespa/routing-provider.def @@ -1,6 +1,8 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # Configuration for the routing config provider +# TODO Remove once YCA filter is removed + namespace=cloud.config # disabled by default, automatically enabled for hosted vespa diff --git a/configdefinitions/src/vespa/routing.def b/configdefinitions/src/vespa/routing.def index eeb37abb4e9..043ef1fff68 100755 --- a/configdefinitions/src/vespa/routing.def +++ b/configdefinitions/src/vespa/routing.def @@ -1,6 +1,8 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # List of routing hosts populated from the zone-application in Hosted mode +# TODO Remove once YCA filter is removed + namespace=cloud.config # Host name(s) of routing/proxy nodes diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/model/RoutingProducer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/model/RoutingProducer.java index 7c85b51c920..07e57270dbd 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/model/RoutingProducer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/model/RoutingProducer.java @@ -17,6 +17,8 @@ import java.util.Set; * * @author Christian Andersen */ +// TODO Delete once YCA filter is removed +@Deprecated(forRemoval = true) public class RoutingProducer implements RoutingConfig.Producer { static final ApplicationName ROUTING_APPLICATION = ApplicationName.from("routing"); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/model/SuperModelConfigProvider.java b/configserver/src/main/java/com/yahoo/vespa/config/server/model/SuperModelConfigProvider.java index 75f53667c4a..9631713c870 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/model/SuperModelConfigProvider.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/model/SuperModelConfigProvider.java @@ -25,8 +25,9 @@ public class SuperModelConfigProvider implements LbServicesConfig.Producer, Rout private final SuperModel superModel; private final LbServicesProducer lbProd; - private final RoutingProducer zoneProd; + @SuppressWarnings("removal") private final RoutingProducer zoneProd; + @SuppressWarnings("removal") // For RoutingProducer public SuperModelConfigProvider(SuperModel superModel, Zone zone, FlagSource flagSource) { this.superModel = superModel; this.lbProd = new LbServicesProducer(Collections.unmodifiableMap(superModel.getModelsPerTenant()), zone, flagSource); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/model/RoutingProducerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/model/RoutingProducerTest.java index 4d968a58bb6..c6a607f81b1 100755 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/model/RoutingProducerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/model/RoutingProducerTest.java @@ -27,6 +27,7 @@ import static org.junit.Assert.assertThat; /** * @author Christian Andersen */ +@SuppressWarnings("removal") // For RoutingProducer public class RoutingProducerTest { @Test public void testNodesFromRoutingAppOnly() throws Exception { |