1 files changed, 8 insertions, 3 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/MockContactRetriever.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/MockContactRetriever.java
index dd0c143ae28..ab39d8e5660 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/MockContactRetriever.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/MockContactRetriever.java
@@ -8,23 +8,28 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
+import java.util.function.Supplier;
 
 /**
  * @author olaa
  */
 public class MockContactRetriever implements ContactRetriever{
 
-    private final Map<PropertyId, Contact> contacts = new HashMap<>();
+    private final Map<PropertyId, Supplier<Contact>> contacts = new HashMap<>();
 
     @Override
     public Contact getContact(Optional<PropertyId> propertyId) {
-        return contacts.getOrDefault(propertyId.get(), contact());
+        return contacts.getOrDefault(propertyId.get(), this::contact).get();
     }
 
-    public void addContact(PropertyId propertyId, Contact contact) {
+    public void addContact(PropertyId propertyId, Supplier<Contact> contact) {
         contacts.put(propertyId, contact);
     }
 
+    public void addContact(PropertyId propertyId, Contact contact) {
+        contacts.put(propertyId, () -> contact);
+    }
+
     public Contact contact() {
         return new Contact(URI.create("contacts.tld"), URI.create("properties.tld"), URI.create("issues.tld"), Collections.emptyList(), "queue", Optional.of("component"));
     }