summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorLeandro Alves <leandroalves@yahooinc.com>2022-03-14 11:35:36 +0100
committerLeandro Alves <leandroalves@yahooinc.com>2022-03-14 11:35:36 +0100
commit46ea4d71ee335057e331ca22cbadc3fd027d00f4 (patch)
treef020f82ee69af5505fad650514faa6ebd8649f2b /controller-server
parentb2b0d390c21fd588909e38473fc260be97c8b8ef (diff)
remove name
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializer.java8
1 files changed, 3 insertions, 5 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializer.java
index fdf04fc4c54..749048036a1 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializer.java
@@ -298,9 +298,9 @@ public class TenantSerializer {
private void toSlime(TenantContacts contacts, Cursor parent) {
if (contacts.isEmpty()) return;
- var cursor = parent.setObject("contacts");
+ var cursor = parent.setArray("contacts");
contacts.all().forEach(contact -> {
- writeContact(contact, cursor.setObject(contact.name()));
+ writeContact(contact, cursor.addObject());
});
}
@@ -363,7 +363,6 @@ public class TenantSerializer {
}
private void writeContact(TenantContacts.Contact<?> contact, Cursor cursor) {
- cursor.setString("name", contact.name());
cursor.setString("type", contact.type().value());
cursor.setString("audience", contact.audience().value());
var data = cursor.setObject("data");
@@ -378,7 +377,6 @@ public class TenantSerializer {
}
private TenantContacts.Contact<?> readContact(Inspector inspector) {
- var name = inspector.field("name").asString();
var type = TenantContacts.Type.from(inspector.field("type").asString())
.orElseThrow(() -> new RuntimeException("Unknown type: " + inspector.field("type").asString()));
var audience = TenantContacts.Audience.from(inspector.field("audience").asString())
@@ -386,7 +384,7 @@ public class TenantSerializer {
switch (type) {
case EMAIL:
var email = new TenantContacts.EmailContact(inspector.field("data").field("email").asString());
- return new TenantContacts.Contact<>(name, type, audience, email);
+ return new TenantContacts.Contact<>(type, audience, email);
default:
throw new IllegalArgumentException("Serialization for contact type not implemented: " + type);
}