Add some convenience methods

3 files changed, 23 insertions, 7 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/configchange/RefeedActions.java b/configserver/src/main/java/com/yahoo/vespa/config/server/configchange/RefeedActions.java
index 87b7b466fbe..72c1d267751 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/configchange/RefeedActions.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/configchange/RefeedActions.java
@@ -88,4 +88,11 @@ public class RefeedActions {
         return new ArrayList<>(actions.values());
     }
 
+    public String format() {
+        return new RefeedActionsFormatter(this).format();
+    }
+
+    public boolean isEmpty() {
+        return getEntries().isEmpty();
+    }
 }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/configchange/RestartActions.java b/configserver/src/main/java/com/yahoo/vespa/config/server/configchange/RestartActions.java
index 6c2c080e6e4..4570abbbf4c 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/configchange/RestartActions.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/configchange/RestartActions.java
@@ -92,4 +92,12 @@ public class RestartActions {
     public List<Entry> getEntries() {
         return new ArrayList<>(actions.values());
     }
+
+    public String format() {
+        return new RestartActionsFormatter(this).format();
+    }
+
+    public boolean isEmpty() {
+        return getEntries().isEmpty();
+    }
 }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandler.java
index 835e2c8d131..e1c20ca2c43 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandler.java
@@ -14,6 +14,7 @@ import com.yahoo.slime.Slime;
 import com.yahoo.vespa.config.server.ApplicationRepository;
 import com.yahoo.vespa.config.server.application.ApplicationSet;
 import com.yahoo.vespa.config.server.application.TenantApplications;
+import com.yahoo.vespa.config.server.configchange.RestartActions;
 import com.yahoo.vespa.config.server.session.LocalSession;
 import com.yahoo.vespa.config.server.session.PrepareParams;
 import com.yahoo.vespa.config.server.session.RemoteSession;
@@ -22,8 +23,6 @@ import com.yahoo.vespa.config.server.tenant.Tenant;
 import com.yahoo.vespa.config.server.tenant.Tenants;
 import com.yahoo.vespa.config.server.configchange.ConfigChangeActions;
 import com.yahoo.vespa.config.server.configchange.RefeedActions;
-import com.yahoo.vespa.config.server.configchange.RefeedActionsFormatter;
-import com.yahoo.vespa.config.server.configchange.RestartActionsFormatter;
 import com.yahoo.vespa.config.server.http.SessionHandler;
 import com.yahoo.vespa.config.server.http.Utils;
 
@@ -82,15 +81,17 @@ public class SessionPrepareHandler extends SessionHandler {
     }
 
     private static void logConfigChangeActions(ConfigChangeActions actions, DeployLogger logger) {
-        if ( ! actions.getRestartActions().getEntries().isEmpty()) {
+        RestartActions restartActions = actions.getRestartActions();
+        if ( ! restartActions.isEmpty()) {
             logger.log(Level.WARNING, "Change(s) between active and new application that require restart:\n" +
-                                      new RestartActionsFormatter(actions.getRestartActions()).format());
+                                      restartActions.format());
         }
-        if ( ! actions.getRefeedActions().getEntries().isEmpty()) {
-            boolean allAllowed = actions.getRefeedActions().getEntries().stream().allMatch(RefeedActions.Entry::allowed);
+        RefeedActions refeedActions = actions.getRefeedActions();
+        if ( ! refeedActions.isEmpty()) {
+            boolean allAllowed = refeedActions.getEntries().stream().allMatch(RefeedActions.Entry::allowed);
             logger.log(allAllowed ? Level.INFO : Level.WARNING,
                        "Change(s) between active and new application that may require re-feed:\n" +
-                       new RefeedActionsFormatter(actions.getRefeedActions()).format());
+                       refeedActions.format());
         }
     }