Nicer error message

2 files changed, 4 insertions, 6 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/tenant/TenantContacts.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/tenant/TenantContacts.java
index 0e3101e4e52..bd8671d814f 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/tenant/TenantContacts.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/tenant/TenantContacts.java
@@ -64,7 +64,7 @@ public class TenantContacts {
 
         public Contact(List<Audience> audiences) {
             this.audiences = List.copyOf(audiences);
-            if (audiences.isEmpty()) throw new IllegalArgumentException("at least one notification activity must be enabled");
+            if (audiences.isEmpty()) throw new IllegalArgumentException("At least one notification activity must be enabled");
         }
 
         public List<Audience> audiences() { return audiences; }
@@ -106,9 +106,7 @@ public class TenantContacts {
 
         @Override
         public String toString() {
-            return "EmailContact{" +
-                    "email='" + email + '\'' +
-                    '}';
+            return "email '" + email + '\'';
         }
     }
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java
index 535560005a3..19ba4d78f02 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java
@@ -177,7 +177,7 @@ public class ApplicationApiCloudTest extends ControllerContainerCloudTest {
         var contactsWithoutAudienceResponse = request("/application/v4/tenant/scoober/info", PUT)
                 .data(contactsWithoutAudience)
                 .roles(Set.of(Role.administrator(tenantName)));
-        tester.assertResponse(contactsWithoutAudienceResponse, "{\"error-code\":\"BAD_REQUEST\",\"message\":\"at least one notification activity must be enabled\"}", 400);
+        tester.assertResponse(contactsWithoutAudienceResponse, "{\"error-code\":\"BAD_REQUEST\",\"message\":\"At least one notification activity must be enabled\"}", 400);
 
         // email needs to be present, not blank, and contain an @
         var contactsWithInvalidEmail = "{\"contacts\": [{\"audiences\": [\"tenant\"],\"email\": \"contact1\"}]}";
@@ -191,7 +191,7 @@ public class ApplicationApiCloudTest extends ControllerContainerCloudTest {
         var contactsWithDuplicateEmailResponse = request("/application/v4/tenant/scoober/info", PUT)
                 .data(contactsWithDuplicateEmail)
                 .roles(Set.of(Role.administrator(tenantName)));
-        tester.assertResponse(contactsWithDuplicateEmailResponse, "{\"error-code\":\"BAD_REQUEST\",\"message\":\"Duplicate contact: EmailContact{email='contact1@email.com'}\"}", 400);
+        tester.assertResponse(contactsWithDuplicateEmailResponse, "{\"error-code\":\"BAD_REQUEST\",\"message\":\"Duplicate contact: email 'contact1@email.com'\"}", 400);
 
         // updating a tenant that already has the fields set works
         var basicInfo = "{\"contactName\": \"Scoober Rentals Inc.\", \"contactEmail\": \"foo@example.com\"}";