diff options
author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-10-11 12:57:56 +0200 |
---|---|---|
committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-10-11 13:11:19 +0200 |
commit | 425499a703d034d6144255689102e86c1557b157 (patch) | |
tree | 18be29b80afb4802cfc91df4b936262888e78500 /configserver-flags/src/main | |
parent | 3e86e12522f6b9b6bd6d45becddeef8eb209d3eb (diff) |
Move FlagRepository to flags
Diffstat (limited to 'configserver-flags/src/main')
3 files changed, 4 insertions, 7 deletions
diff --git a/configserver-flags/src/main/java/com/yahoo/vespa/configserver/flags/FlagsDb.java b/configserver-flags/src/main/java/com/yahoo/vespa/configserver/flags/FlagsDb.java index 2c29ae0b818..6ccb2a61b56 100644 --- a/configserver-flags/src/main/java/com/yahoo/vespa/configserver/flags/FlagsDb.java +++ b/configserver-flags/src/main/java/com/yahoo/vespa/configserver/flags/FlagsDb.java @@ -2,15 +2,15 @@ package com.yahoo.vespa.configserver.flags; import com.yahoo.vespa.flags.FlagId; +import com.yahoo.vespa.flags.FlagRepository; import com.yahoo.vespa.flags.json.FlagData; -import java.util.Map; import java.util.Optional; /** * @author hakonhall */ -public interface FlagsDb { +public interface FlagsDb extends FlagRepository { /** Get the String value of the flag. */ Optional<FlagData> getValue(FlagId flagId); @@ -19,7 +19,4 @@ public interface FlagsDb { /** Remove the flag value if it exists. */ void removeValue(FlagId flagId); - - /** Get all flags that have been set. */ - Map<FlagId, FlagData> getAllFlags(); } diff --git a/configserver-flags/src/main/java/com/yahoo/vespa/configserver/flags/db/FlagsDbImpl.java b/configserver-flags/src/main/java/com/yahoo/vespa/configserver/flags/db/FlagsDbImpl.java index 5058358ba03..66423492a73 100644 --- a/configserver-flags/src/main/java/com/yahoo/vespa/configserver/flags/db/FlagsDbImpl.java +++ b/configserver-flags/src/main/java/com/yahoo/vespa/configserver/flags/db/FlagsDbImpl.java @@ -48,7 +48,7 @@ public class FlagsDbImpl implements FlagsDb { } @Override - public Map<FlagId, FlagData> getAllFlags() { + public Map<FlagId, FlagData> getAllFlagData() { List<ChildData> dataList = cache.getCurrentData(); return dataList.stream() .map(ChildData::getData) diff --git a/configserver-flags/src/main/java/com/yahoo/vespa/configserver/flags/http/FlagsHandler.java b/configserver-flags/src/main/java/com/yahoo/vespa/configserver/flags/http/FlagsHandler.java index 8810a13f909..d34b1fd949f 100644 --- a/configserver-flags/src/main/java/com/yahoo/vespa/configserver/flags/http/FlagsHandler.java +++ b/configserver-flags/src/main/java/com/yahoo/vespa/configserver/flags/http/FlagsHandler.java @@ -90,7 +90,7 @@ public class FlagsHandler extends LoggingRequestHandler { } private HttpResponse getFlagDataList(HttpRequest request) { - return new FlagDataListResponse(flagsV1Uri(request), flagsDb.getAllFlags(), + return new FlagDataListResponse(flagsV1Uri(request), flagsDb.getAllFlagData(), Objects.equals(request.getProperty("recursive"), "true")); } |