From 475b59bafc01b15e97903019b0f7d3cc97ed97cd Mon Sep 17 00:00:00 2001 From: Håkon Hallingstad Date: Wed, 2 Jan 2019 17:22:56 +0100 Subject: Include flag id in flag data and other review fixes --- .../java/com/yahoo/vespa/configserver/flags/db/FlagsDbImplTest.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'configserver-flags/src/test/java/com/yahoo') 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 1fe61130348..0523090c18b 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 @@ -31,15 +31,14 @@ public class FlagsDbImplTest { Condition condition1 = new Condition(Condition.Type.WHITELIST, FetchVector.Dimension.HOSTNAME, "host1"); Rule rule1 = new Rule(Optional.of(JsonNodeRawFlag.fromJson("13")), condition1); - FlagData data = new FlagData(new FetchVector().with(FetchVector.Dimension.ZONE_ID, "zone-a"), rule1); FlagId flagId = new FlagId("id"); + FlagData data = new FlagData(flagId, new FetchVector().with(FetchVector.Dimension.ZONE_ID, "zone-a"), rule1); db.setValue(flagId, data); - assertTrue(db.getValue(flagId).isPresent()); Optional dataCopy = db.getValue(flagId); assertTrue(dataCopy.isPresent()); - assertEquals("{\"rules\":[{\"conditions\":[{\"type\":\"whitelist\",\"dimension\":\"hostname\"," + + assertEquals("{\"id\":\"id\",\"rules\":[{\"conditions\":[{\"type\":\"whitelist\",\"dimension\":\"hostname\"," + "\"values\":[\"host1\"]}],\"value\":13}],\"attributes\":{\"zone\":\"zone-a\"}}", dataCopy.get().serializeToJson()); -- cgit v1.2.3