diff options
| author | Martin Polden <mpolden@mpolden.no> | 2017-10-29 10:05:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-29 10:05:36 +0100 |
| commit | 6adbc952028257739f526a758f4ea94aaec95b39 (patch) | |
| tree | b329cb198c0f307486177bc36f3129053e53d5ef | |
| parent | eebc99cba6bdd334f0ea450d177bb3871aeed7d2 (diff) | |
| parent | 5b18f9b0ff3a16a05c128ea786f09e2231627d03 (diff) | |
Merge pull request #3938 from vespa-engine/jvenstad/return-empty-defult-in-mock
Return empty contact list for unknown property ids in mock
3 files changed, 8 insertions, 2 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 4eaca8fb642..5584f8a95fb 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 @@ -85,7 +85,7 @@ public class MockOrganization implements Organization { @Override public List<? extends List<? extends User>> contactsFor(PropertyId propertyId) { - return properties.get(propertyId).contacts; + return properties.getOrDefault(propertyId, new PropertyInfo()).contacts; } @Override diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/opsdb-tenant-with-new-id-without-applications.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/opsdb-tenant-with-new-id-without-applications.json index f00b3c5bb1a..3f4b6017971 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/opsdb-tenant-with-new-id-without-applications.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/opsdb-tenant-with-new-id-without-applications.json @@ -5,5 +5,11 @@ "userGroup": "group1", "applications": [ + ], + "propertyUrl": "www.properties.tld/4321", + "contactsUrl": "www.contacts.tld/4321", + "issueCreationUrl": "www.issues.tld/4321", + "contacts": [ + ] } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-without-applications.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-without-applications.json index 88ec5ec7d3d..69669b5dfb8 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-without-applications.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-without-applications.json @@ -5,4 +5,4 @@ "applications": [ ] -}
\ No newline at end of file +} |