Merge pull request #7047 from vespa-engine/jvenstad/non-nulls-in-org-mock

Avoid NPEs if stub is actually used

1 files changed, 4 insertions, 5 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/MockOrganization.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/MockOrganization.java
index 8efbde52d4a..b367dd2b23c 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/MockOrganization.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/MockOrganization.java
@@ -153,7 +153,7 @@ public class MockOrganization extends AbstractComponent implements Organization
             this.issue = issue;
             this.updated = clock.instant();
             this.open = true;
-            this.assignee = issue.assignee().orElse(properties.get(issue.propertyId()).defaultAssignee);
+            this.assignee = issue.assignee().orElse(null);
         }
 
         public Issue issue() { return issue; }
@@ -164,11 +164,10 @@ public class MockOrganization extends AbstractComponent implements Organization
 
     private class PropertyInfo {
 
-        private User defaultAssignee;
         private List<List<User>> contacts = Collections.emptyList();
-        private URI issueUrl;
-        private URI contactsUrl;
-        private URI propertyUrl;
+        private URI issueUrl = URI.create("issues.tld");
+        private URI contactsUrl = URI.create("contacts.tld");
+        private URI propertyUrl = URI.create("properties.tld");
 
     }