aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjonmv <venstad@gmail.com>2022-12-05 15:14:20 +0100
committerjonmv <venstad@gmail.com>2022-12-05 15:14:20 +0100
commitbd9f4f3f3cab33596aad75d4fb37ad29799277ce (patch)
treec0727b38dfe46deda41fedcf5f727d3e2e22f80e
parent4bde207f4dd4ec39db0f9b443c4156bbfaf30853 (diff)
Use camel-case in API response
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java4
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java2
2 files changed, 3 insertions, 3 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 a76c5c18f9a..5f57e17a1b2 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
@@ -1966,13 +1966,13 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
List<LoadBalancer> lbs = controller.serviceRegistry().configServer().getLoadBalancers(ApplicationId.from(tenantName, applicationName, instanceName),
ZoneId.from(environment, region));
Slime slime = new Slime();
- Cursor lbArray = slime.setObject().setArray("load-balancers");
+ Cursor lbArray = slime.setObject().setArray("loadBalancers");
for (LoadBalancer lb : lbs) {
Cursor lbObject = lbArray.addObject();
lbObject.setString("cluster", lb.cluster().value());
lb.service().ifPresent(service -> {
lbObject.setString("serviceId", service.id());
- service.allowedUrns().forEach(lbObject.setArray("allowed-urns")::addString);
+ service.allowedUrns().forEach(lbObject.setArray("allowedUrns")::addString);
});
}
return new SlimeJsonResponse(slime);
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
index 2e73b3fc5fb..678e659fd1f 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
@@ -700,7 +700,7 @@ public class ApplicationApiTest extends ControllerContainerTest {
// GET private service info
tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/environment/prod/region/us-central-1/instance/instance1/private-service", GET)
.userIdentity(USER_ID),
- "{\"load-balancers\":[{\"cluster\":\"default\",\"serviceId\":\"service\",\"allowed-urns\":[\"arne\"]}]}");
+ "{\"loadBalancers\":[{\"cluster\":\"default\",\"serviceId\":\"service\",\"allowedUrns\":[\"arne\"]}]}");
// GET service/state/v1
tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/instance/instance1/environment/prod/region/us-central-1/service/storagenode/host.com/state/v1/?foo=bar", GET)