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 | |
parent | 3e86e12522f6b9b6bd6d45becddeef8eb209d3eb (diff) |
Move FlagRepository to flags
-rw-r--r-- | configserver-flags/src/main/java/com/yahoo/vespa/configserver/flags/FlagsDb.java | 7 | ||||
-rw-r--r-- | configserver-flags/src/main/java/com/yahoo/vespa/configserver/flags/db/FlagsDbImpl.java | 2 | ||||
-rw-r--r-- | configserver-flags/src/main/java/com/yahoo/vespa/configserver/flags/http/FlagsHandler.java | 2 | ||||
-rw-r--r-- | configserver-flags/src/test/java/com/yahoo/vespa/configserver/flags/db/FlagsDbImplTest.java | 2 | ||||
-rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/FlagRepository.java (renamed from node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/flags/FlagRepository.java) | 3 | ||||
-rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerClients.java | 2 | ||||
-rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/RealConfigServerClients.java | 2 | ||||
-rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/flags/RealFlagRepository.java | 1 |
8 files changed, 9 insertions, 12 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")); } diff --git a/configserver-flags/src/test/java/com/yahoo/vespa/configserver/flags/db/FlagsDbImplTest.java b/configserver-flags/src/test/java/com/yahoo/vespa/configserver/flags/db/FlagsDbImplTest.java index ecc9bacb081..7460e42c866 100644 --- a/configserver-flags/src/test/java/com/yahoo/vespa/configserver/flags/db/FlagsDbImplTest.java +++ b/configserver-flags/src/test/java/com/yahoo/vespa/configserver/flags/db/FlagsDbImplTest.java @@ -45,7 +45,7 @@ public class FlagsDbImplTest { FlagId flagId2 = new FlagId("id2"); FlagData data2 = new FlagData(flagId2, new FetchVector().with(FetchVector.Dimension.ZONE_ID, "zone-a"), rule1); db.setValue(flagId2, data2); - Map<FlagId, FlagData> flags = db.getAllFlags(); + Map<FlagId, FlagData> flags = db.getAllFlagData(); assertThat(flags.size(), equalTo(2)); assertThat(flags.get(flagId), notNullValue()); assertThat(flags.get(flagId2), notNullValue()); diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/flags/FlagRepository.java b/flags/src/main/java/com/yahoo/vespa/flags/FlagRepository.java index 078b745bac4..ba9919ff123 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/flags/FlagRepository.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/FlagRepository.java @@ -1,7 +1,6 @@ // Copyright 2019 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.node.admin.configserver.flags; +package com.yahoo.vespa.flags; -import com.yahoo.vespa.flags.FlagId; import com.yahoo.vespa.flags.json.FlagData; import java.util.Map; diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerClients.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerClients.java index ab899f9f919..6623a995006 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerClients.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerClients.java @@ -1,7 +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.hosted.node.admin.configserver; -import com.yahoo.vespa.hosted.node.admin.configserver.flags.FlagRepository; +import com.yahoo.vespa.flags.FlagRepository; import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeRepository; import com.yahoo.vespa.hosted.node.admin.configserver.orchestrator.Orchestrator; import com.yahoo.vespa.hosted.node.admin.configserver.state.State; diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/RealConfigServerClients.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/RealConfigServerClients.java index af11c300c2b..7d52b9d72b0 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/RealConfigServerClients.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/RealConfigServerClients.java @@ -1,7 +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.hosted.node.admin.configserver; -import com.yahoo.vespa.hosted.node.admin.configserver.flags.FlagRepository; +import com.yahoo.vespa.flags.FlagRepository; import com.yahoo.vespa.hosted.node.admin.configserver.flags.RealFlagRepository; import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeRepository; import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.RealNodeRepository; diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/flags/RealFlagRepository.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/flags/RealFlagRepository.java index a017569294e..8d9c5a2d98e 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/flags/RealFlagRepository.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/flags/RealFlagRepository.java @@ -2,6 +2,7 @@ package com.yahoo.vespa.hosted.node.admin.configserver.flags; import com.yahoo.vespa.flags.FlagId; +import com.yahoo.vespa.flags.FlagRepository; import com.yahoo.vespa.flags.json.FlagData; import com.yahoo.vespa.flags.json.wire.WireFlagDataList; import com.yahoo.vespa.hosted.node.admin.configserver.ConfigServerApi; |