diff options
author | Valerij Fredriksen <freva@users.noreply.github.com> | 2023-03-01 15:40:42 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-01 15:40:42 +0100 |
commit | ef504401235699f40e6f699f765d5f4d8852359d (patch) | |
tree | 096c4bda135ad517c802dbc2440525d5e2b605d7 | |
parent | 615bba3fe07d5c7661ae028d56af4491de237bd0 (diff) | |
parent | ff5712f794890a08cc104314f2b4d1843b6e74d7 (diff) |
Merge pull request #26252 from vespa-engine/ogronnesby/input-field-mismatch
There is a mismatch on field names between read/write
2 files changed, 2 insertions, 2 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java index 7fcad017569..6d3c15c2d57 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java @@ -596,7 +596,7 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler { var mergedAddress = updateTenantInfoAddress(inspector.field("address"), info.address()); var mergedInfo = info - .withName(getString(inspector.field("tenant").field("name"), info.name())) + .withName(getString(inspector.field("tenant").field("company"), info.name())) .withWebsite(getString(inspector.field("tenant").field("website"), info.website())) .withContact(mergedContact) .withAddress(mergedAddress); 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 8a37bb560e2..41622e669e6 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 @@ -77,7 +77,7 @@ public class ApplicationApiCloudTest extends ControllerContainerCloudTest { .roles(Set.of(Role.administrator(tenantName))); tester.assertResponse(updateRequest, "{\"message\":\"Tenant info updated\"}", 200); - tester.assertResponse(request, "{\"contact\":{\"name\":\"Some Name\",\"email\":\"foo@example.com\",\"emailVerified\":false},\"tenant\":{\"company\":\"\",\"website\":\"https://example.com/\"}}", 200); + tester.assertResponse(request, "{\"contact\":{\"name\":\"Some Name\",\"email\":\"foo@example.com\",\"emailVerified\":false},\"tenant\":{\"company\":\"Scoober, Inc.\",\"website\":\"https://example.com/\"}}", 200); } @Test |