diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-04-24 14:59:31 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-04-24 14:59:31 +0200 |
| commit | db885919da35a354360700c227d10a0fe71af7c0 (patch) | |
| tree | 324bfb932a240cd4eef7bac786afcf1516f3aa55 /configserver | |
| parent | d8bd354c0a57b0edf9bf8ece535a50bbc13b415a (diff) | |
Deprecate RoutingProducer and add TODOs
Diffstat (limited to 'configserver')
3 files changed, 5 insertions, 1 deletions
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 { |