Define nessus-agent-group flag and make Dimension top-level class

3 files changed, 8 insertions, 8 deletions

diff --git a/configserver-flags/src/main/java/com/yahoo/vespa/configserver/flags/http/DefinedFlag.java b/configserver-flags/src/main/java/com/yahoo/vespa/configserver/flags/http/DefinedFlag.java
index 84ba451ac7f..c6e51e530b1 100644
--- a/configserver-flags/src/main/java/com/yahoo/vespa/configserver/flags/http/DefinedFlag.java
+++ b/configserver-flags/src/main/java/com/yahoo/vespa/configserver/flags/http/DefinedFlag.java
@@ -8,7 +8,6 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.yahoo.container.jdisc.HttpResponse;
 import com.yahoo.jdisc.Response;
 import com.yahoo.vespa.flags.FlagDefinition;
-import com.yahoo.vespa.flags.json.DimensionHelper;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -42,7 +41,7 @@ public class DefinedFlag extends HttpResponse {
         definitionNode.put("createdAt", flagDefinition.getCreatedAt().toString());
         definitionNode.put("expiresAt", flagDefinition.getExpiresAt().toString());
         ArrayNode dimensionsNode = definitionNode.putArray("dimensions");
-        flagDefinition.getDimensions().forEach(dimension -> dimensionsNode.add(DimensionHelper.toWire(dimension)));
+        flagDefinition.getDimensions().forEach(dimension -> dimensionsNode.add(dimension.toWire()));
     }
 
     @Override
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 a82a6f7c599..c9c11e2b0e2 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
@@ -2,6 +2,7 @@
 package com.yahoo.vespa.configserver.flags.db;
 
 import com.yahoo.vespa.curator.mock.MockCurator;
+import com.yahoo.vespa.flags.Dimension;
 import com.yahoo.vespa.flags.FetchVector;
 import com.yahoo.vespa.flags.FlagId;
 import com.yahoo.vespa.flags.JsonNodeRawFlag;
@@ -28,11 +29,11 @@ public class FlagsDbImplTest {
         MockCurator curator = new MockCurator();
         FlagsDbImpl db = new FlagsDbImpl(curator);
 
-        var params = new Condition.CreateParams(FetchVector.Dimension.HOSTNAME).withValues("host1");
+        var params = new Condition.CreateParams(Dimension.HOSTNAME).withValues("host1");
         Condition condition1 = WhitelistCondition.create(params);
         Rule rule1 = new Rule(Optional.of(JsonNodeRawFlag.fromJson("13")), condition1);
         FlagId flagId = new FlagId("id");
-        FlagData data = new FlagData(flagId, new FetchVector().with(FetchVector.Dimension.ZONE_ID, "zone-a"), rule1);
+        FlagData data = new FlagData(flagId, new FetchVector().with(Dimension.ZONE_ID, "zone-a"), rule1);
         db.setValue(flagId, data);
 
         Optional<FlagData> dataCopy = db.getValue(flagId);
@@ -43,7 +44,7 @@ public class FlagsDbImplTest {
                 dataCopy.get().serializeToJson());
 
         FlagId flagId2 = new FlagId("id2");
-        FlagData data2 = new FlagData(flagId2, new FetchVector().with(FetchVector.Dimension.ZONE_ID, "zone-a"), rule1);
+        FlagData data2 = new FlagData(flagId2, new FetchVector().with(Dimension.ZONE_ID, "zone-a"), rule1);
         db.setValue(flagId2, data2);
         Map<FlagId, FlagData> flags = db.getAllFlagData();
         assertEquals(flags.size(), 2);
diff --git a/configserver-flags/src/test/java/com/yahoo/vespa/configserver/flags/http/FlagsHandlerTest.java b/configserver-flags/src/test/java/com/yahoo/vespa/configserver/flags/http/FlagsHandlerTest.java
index 3d37117c002..1e477a6da6e 100644
--- a/configserver-flags/src/test/java/com/yahoo/vespa/configserver/flags/http/FlagsHandlerTest.java
+++ b/configserver-flags/src/test/java/com/yahoo/vespa/configserver/flags/http/FlagsHandlerTest.java
@@ -8,7 +8,7 @@ import com.yahoo.text.Utf8;
 import com.yahoo.vespa.configserver.flags.FlagsDb;
 import com.yahoo.vespa.configserver.flags.db.FlagsDbImpl;
 import com.yahoo.vespa.curator.mock.MockCurator;
-import com.yahoo.vespa.flags.FetchVector;
+import com.yahoo.vespa.flags.Dimension;
 import com.yahoo.vespa.flags.FlagId;
 import com.yahoo.vespa.flags.Flags;
 import com.yahoo.vespa.flags.UnboundBooleanFlag;
@@ -34,7 +34,7 @@ public class FlagsHandlerTest {
             "id1", false, List.of("joe"), "2010-01-01", "2030-01-01", "desc1", "mod1");
     private static final UnboundBooleanFlag FLAG2 = Flags.defineFeatureFlag(
             "id2", true, List.of("joe"), "2010-01-01", "2030-01-01", "desc2", "mod2",
-            FetchVector.Dimension.HOSTNAME, FetchVector.Dimension.INSTANCE_ID);
+            Dimension.HOSTNAME, Dimension.INSTANCE_ID);
 
     private final FlagsDb flagsDb = new FlagsDbImpl(new MockCurator());
     private final FlagsHandler handler = new FlagsHandler(FlagsHandler.testContext(), flagsDb);
@@ -54,7 +54,7 @@ public class FlagsHandlerTest {
     void testDefined() {
         try (Flags.Replacer replacer = Flags.clearFlagsForTesting()) {
             fixUnusedWarning(replacer);
-            Flags.defineFeatureFlag("id", false, List.of("joe"), "2010-01-01", "2030-01-01", "desc", "mod", FetchVector.Dimension.HOSTNAME);
+            Flags.defineFeatureFlag("id", false, List.of("joe"), "2010-01-01", "2030-01-01", "desc", "mod", Dimension.HOSTNAME);
             verifySuccessfulRequest(Method.GET, "/defined", "",
                     "{\"id\":{\"description\":\"desc\",\"modification-effect\":\"mod\",\"owners\":[\"joe\"],\"createdAt\":\"2010-01-01T00:00:00Z\",\"expiresAt\":\"2030-01-01T00:00:00Z\",\"dimensions\":[\"hostname\"]}}");