One SlobrokMonitor2 per application

2 files changed, 7 insertions, 1 deletions

diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/SuperModel.java b/config-model-api/src/main/java/com/yahoo/config/model/api/SuperModel.java
index d03824120d8..8e918392cb0 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/SuperModel.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/SuperModel.java
@@ -9,6 +9,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 public class SuperModel {
@@ -30,6 +31,11 @@ public class SuperModel {
         return models;
     }
 
+    public Set<ApplicationId> getAllApplicationIds() {
+        return models.values().stream().flatMap(entry -> entry.keySet().stream())
+                .collect(Collectors.toSet());
+    }
+
     public List<ApplicationInfo> getAllApplicationInfos() {
         return models.values().stream().flatMap(entry -> entry.values().stream()).collect(Collectors.toList());
     }
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/SuperModelListener.java b/config-model-api/src/main/java/com/yahoo/config/model/api/SuperModelListener.java
index 043e23902b2..497c38af908 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/SuperModelListener.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/SuperModelListener.java
@@ -11,7 +11,7 @@ public interface SuperModelListener {
      * Application has been activated: Either deployed the first time,
      * internally redeployed, or externally triggered redeploy.
      */
-    void applicationActivated(SuperModel superModel, ApplicationId id);
+    void applicationActivated(SuperModel superModel, ApplicationInfo application);
 
     /**
      * Application has been removed.