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

3 files changed, 20 insertions, 20 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
index 5ac1b685b97..b83a8290cac 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
@@ -48,7 +48,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import static com.yahoo.vespa.curator.Curator.CompletionWaiter;
-import static com.yahoo.vespa.flags.FetchVector.Dimension.INSTANCE_ID;
+import static com.yahoo.vespa.flags.Dimension.INSTANCE_ID;
 import static java.util.stream.Collectors.toSet;
 
 /**
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
index 76af53eba90..59266dfffaf 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
@@ -28,7 +28,7 @@ import com.yahoo.config.provision.HostName;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.container.jdisc.secretstore.SecretStore;
 import com.yahoo.vespa.config.server.tenant.SecretStoreExternalIdRetriever;
-import com.yahoo.vespa.flags.FetchVector;
+import com.yahoo.vespa.flags.Dimension;
 import com.yahoo.vespa.flags.FlagSource;
 import com.yahoo.vespa.flags.Flags;
 import com.yahoo.vespa.flags.PermanentFlags;
@@ -46,7 +46,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.function.Predicate;
 
 import static com.yahoo.vespa.config.server.ConfigServerSpec.fromConfig;
-import static com.yahoo.vespa.flags.FetchVector.Dimension.CLUSTER_TYPE;
+import static com.yahoo.vespa.flags.Dimension.CLUSTER_TYPE;
 
 /**
  * Implementation of {@link ModelContext} for configserver.
@@ -307,10 +307,10 @@ public class ModelContextImpl implements ModelContext {
 
         private static <V> V flagValue(FlagSource source, ApplicationId appId, Version vespaVersion, UnboundFlag<? extends V, ?, ?> flag) {
             return flag.bindTo(source)
-                    .with(FetchVector.Dimension.INSTANCE_ID, appId.serializedForm())
-                    .with(FetchVector.Dimension.APPLICATION, appId.toSerializedFormWithoutInstance())
-                    .with(FetchVector.Dimension.VESPA_VERSION, vespaVersion.toFullString())
-                    .with(FetchVector.Dimension.TENANT_ID, appId.tenant().value())
+                    .with(Dimension.INSTANCE_ID, appId.serializedForm())
+                    .with(Dimension.APPLICATION, appId.toSerializedFormWithoutInstance())
+                    .with(Dimension.VESPA_VERSION, vespaVersion.toFullString())
+                    .with(Dimension.TENANT_ID, appId.tenant().value())
                     .boxedValue();
         }
 
@@ -320,10 +320,10 @@ public class ModelContextImpl implements ModelContext {
                                        ClusterSpec.Type clusterType,
                                        UnboundFlag<? extends V, ?, ?> flag) {
             return flag.bindTo(source)
-                       .with(FetchVector.Dimension.INSTANCE_ID, appId.serializedForm())
-                       .with(FetchVector.Dimension.APPLICATION, appId.toSerializedFormWithoutInstance())
-                       .with(FetchVector.Dimension.CLUSTER_TYPE, clusterType.name())
-                       .with(FetchVector.Dimension.VESPA_VERSION, vespaVersion.toFullString())
+                       .with(Dimension.INSTANCE_ID, appId.serializedForm())
+                       .with(Dimension.APPLICATION, appId.toSerializedFormWithoutInstance())
+                       .with(Dimension.CLUSTER_TYPE, clusterType.name())
+                       .with(Dimension.VESPA_VERSION, vespaVersion.toFullString())
                        .boxedValue();
         }
 
@@ -333,10 +333,10 @@ public class ModelContextImpl implements ModelContext {
                                        ClusterSpec.Id clusterId,
                                        UnboundFlag<? extends V, ?, ?> flag) {
             return flag.bindTo(source)
-                       .with(FetchVector.Dimension.INSTANCE_ID, appId.serializedForm())
-                       .with(FetchVector.Dimension.APPLICATION, appId.toSerializedFormWithoutInstance())
-                       .with(FetchVector.Dimension.CLUSTER_ID, clusterId.value())
-                       .with(FetchVector.Dimension.VESPA_VERSION, vespaVersion.toFullString())
+                       .with(Dimension.INSTANCE_ID, appId.serializedForm())
+                       .with(Dimension.APPLICATION, appId.toSerializedFormWithoutInstance())
+                       .with(Dimension.CLUSTER_ID, clusterId.value())
+                       .with(Dimension.VESPA_VERSION, vespaVersion.toFullString())
                        .boxedValue();
         }
 
@@ -411,8 +411,8 @@ public class ModelContextImpl implements ModelContext {
             this.tenantSecretStores = tenantSecretStores;
             this.secretStore = secretStore;
             this.jvmGCOptionsFlag = PermanentFlags.JVM_GC_OPTIONS.bindTo(flagSource)
-                    .with(FetchVector.Dimension.INSTANCE_ID, applicationId.serializedForm())
-                    .with(FetchVector.Dimension.APPLICATION, applicationId.toSerializedFormWithoutInstance());
+                    .with(Dimension.INSTANCE_ID, applicationId.serializedForm())
+                    .with(Dimension.APPLICATION, applicationId.toSerializedFormWithoutInstance());
             this.allowDisableMtls = flagValue(flagSource, applicationId, PermanentFlags.ALLOW_DISABLE_MTLS);
             this.operatorCertificates = operatorCertificates;
             this.tlsCiphersOverride = flagValue(flagSource, applicationId, PermanentFlags.TLS_CIPHERS_OVERRIDE);
@@ -523,8 +523,8 @@ public class ModelContextImpl implements ModelContext {
 
     private static <V> V flagValue(FlagSource source, ApplicationId appId, UnboundFlag<? extends V, ?, ?> flag) {
         return flag.bindTo(source)
-                .with(FetchVector.Dimension.INSTANCE_ID, appId.serializedForm())
-                .with(FetchVector.Dimension.APPLICATION, appId.toSerializedFormWithoutInstance())
+                .with(Dimension.INSTANCE_ID, appId.serializedForm())
+                .with(Dimension.APPLICATION, appId.toSerializedFormWithoutInstance())
                 .boxedValue();
     }
 }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
index 99d5d23a87c..47b8215b52d 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
@@ -83,7 +83,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import static com.yahoo.vespa.curator.Curator.CompletionWaiter;
-import static com.yahoo.vespa.flags.FetchVector.Dimension.INSTANCE_ID;
+import static com.yahoo.vespa.flags.Dimension.INSTANCE_ID;
 import static java.nio.file.Files.readAttributes;
 
 /**