diff options
author | Håkon Hallingstad <hakon@oath.com> | 2019-01-10 18:00:00 +0100 |
---|---|---|
committer | Håkon Hallingstad <hakon@oath.com> | 2019-01-10 18:00:00 +0100 |
commit | 8e32ae17457155178601a8e8d1c7509ef5d4b0fe (patch) | |
tree | f99a526ae860303e06baba38338ed6d5c5d9c75b /configserver-flags/src | |
parent | e87ecf42627da4fc1b38c6d8eeceadd1784558bc (diff) |
Inject exported FlagDb instead of non-exported FlagsDbImpl
Diffstat (limited to 'configserver-flags/src')
2 files changed, 4 insertions, 4 deletions
diff --git a/configserver-flags/src/main/java/com/yahoo/vespa/configserver/flags/ConfigServerFlagSource.java b/configserver-flags/src/main/java/com/yahoo/vespa/configserver/flags/ConfigServerFlagSource.java index 9768c42b477..d452d8a4aad 100644 --- a/configserver-flags/src/main/java/com/yahoo/vespa/configserver/flags/ConfigServerFlagSource.java +++ b/configserver-flags/src/main/java/com/yahoo/vespa/configserver/flags/ConfigServerFlagSource.java @@ -2,7 +2,6 @@ package com.yahoo.vespa.configserver.flags; import com.google.inject.Inject; -import com.yahoo.vespa.configserver.flags.db.FlagsDbImpl; import com.yahoo.vespa.configserver.flags.db.ZooKeeperFlagSource; import com.yahoo.vespa.flags.FileFlagSource; import com.yahoo.vespa.flags.OrderedFlagSource; @@ -12,7 +11,7 @@ import com.yahoo.vespa.flags.OrderedFlagSource; */ public class ConfigServerFlagSource extends OrderedFlagSource { @Inject - public ConfigServerFlagSource(FlagsDbImpl flagsDb) { + public ConfigServerFlagSource(FlagsDb flagsDb) { super(new FileFlagSource(), new ZooKeeperFlagSource(flagsDb)); } } diff --git a/configserver-flags/src/main/java/com/yahoo/vespa/configserver/flags/db/ZooKeeperFlagSource.java b/configserver-flags/src/main/java/com/yahoo/vespa/configserver/flags/db/ZooKeeperFlagSource.java index bd99ac6eca9..4a9d604b4bd 100644 --- a/configserver-flags/src/main/java/com/yahoo/vespa/configserver/flags/db/ZooKeeperFlagSource.java +++ b/configserver-flags/src/main/java/com/yahoo/vespa/configserver/flags/db/ZooKeeperFlagSource.java @@ -1,6 +1,7 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.configserver.flags.db; +import com.yahoo.vespa.configserver.flags.FlagsDb; import com.yahoo.vespa.flags.FetchVector; import com.yahoo.vespa.flags.FlagId; import com.yahoo.vespa.flags.FlagSource; @@ -12,9 +13,9 @@ import java.util.Optional; * @author hakonhall */ public class ZooKeeperFlagSource implements FlagSource { - private final FlagsDbImpl flagsDb; + private final FlagsDb flagsDb; - public ZooKeeperFlagSource(FlagsDbImpl flagsDb) { + public ZooKeeperFlagSource(FlagsDb flagsDb) { this.flagsDb = flagsDb; } |