1 files changed, 27 insertions, 27 deletions
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/model/ApplicationInstanceGenerator.java b/service-monitor/src/main/java/com/yahoo/vespa/service/model/ApplicationInstanceGenerator.java
index db15c2789d5..412c47bee95 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/model/ApplicationInstanceGenerator.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/model/ApplicationInstanceGenerator.java
@@ -57,14 +57,6 @@ public class ApplicationInstanceGenerator {
         return makeApplicationInstanceLimitedToHosts(serviceStatusProvider, hostname -> true);
     }
 
-    public static ServiceId getServiceId(ApplicationInfo applicationInfo, ServiceInfo serviceInfo) {
-        return new ServiceId(
-                applicationInfo.getApplicationId(),
-                getClusterId(serviceInfo),
-                toServiceType(serviceInfo),
-                toConfigId(serviceInfo));
-    }
-
     public ApplicationInstanceReference toApplicationInstanceReference() {
         TenantId tenantId = new TenantId(applicationInfo.getApplicationId().tenant().toString());
         ApplicationInstanceId applicationInstanceId = toApplicationInstanceId(applicationInfo.getApplicationId(), zone);
@@ -107,25 +99,6 @@ public class ApplicationInstanceGenerator {
                 InstanceName.from(appNameParts[4]));
     }
 
-    private static ApplicationInstanceId toApplicationInstanceId(ApplicationId applicationId, Zone zone) {
-        if (applicationId.equals(configServerApplicationId)) {
-            // Removing this historical discrepancy would break orchestration during rollout.
-            // An alternative may be to use a feature flag and flip it between releases,
-            // once that's available.
-            return new ApplicationInstanceId(applicationId.application().value());
-        } else {
-            return new ApplicationInstanceId(String.format("%s:%s:%s:%s",
-                    applicationId.application().value(),
-                    zone.environment().value(),
-                    zone.region().value(),
-                    applicationId.instance().value()));
-        }
-    }
-
-    private static ClusterId getClusterId(ServiceInfo serviceInfo) {
-        return new ClusterId(serviceInfo.getProperty(CLUSTER_ID_PROPERTY_NAME).orElse(""));
-    }
-
     private ApplicationInstance makeApplicationInstanceLimitedToHosts(ServiceStatusProvider serviceStatusProvider,
                                                                       Predicate<HostName> includeHostPredicate) {
         Map<ServiceClusterKey, Set<ServiceInstance>> groupedServiceInstances = new HashMap<>();
@@ -187,6 +160,33 @@ public class ApplicationInstanceGenerator {
         return new ServiceInstance(configId, hostName, status);
     }
 
+    private static ApplicationInstanceId toApplicationInstanceId(ApplicationId applicationId, Zone zone) {
+        if (applicationId.equals(configServerApplicationId)) {
+            // Removing this historical discrepancy would break orchestration during rollout.
+            // An alternative may be to use a feature flag and flip it between releases,
+            // once that's available.
+            return new ApplicationInstanceId(applicationId.application().value());
+        } else {
+            return new ApplicationInstanceId(String.format("%s:%s:%s:%s",
+                    applicationId.application().value(),
+                    zone.environment().value(),
+                    zone.region().value(),
+                    applicationId.instance().value()));
+        }
+    }
+
+    public static ServiceId getServiceId(ApplicationInfo applicationInfo, ServiceInfo serviceInfo) {
+        return new ServiceId(
+                applicationInfo.getApplicationId(),
+                getClusterId(serviceInfo),
+                toServiceType(serviceInfo),
+                toConfigId(serviceInfo));
+    }
+
+    private static ClusterId getClusterId(ServiceInfo serviceInfo) {
+        return new ClusterId(serviceInfo.getProperty(CLUSTER_ID_PROPERTY_NAME).orElse(""));
+    }
+
     private static ServiceClusterKey toServiceClusterKey(ServiceInfo serviceInfo) {
         ClusterId clusterId = getClusterId(serviceInfo);
         ServiceType serviceType = toServiceType(serviceInfo);