Comments taken into account

5 files changed, 10 insertions, 10 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Application.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Application.java
index f7630cb9dd9..b1931e6cac7 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Application.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Application.java
@@ -130,8 +130,8 @@ public class Application {
         return new Application(id, deploymentSpec, validationOverrides, deployments, deploymentJobs.withProjectId(projectId), deploying, outstandingChange);
     }
 
-    public Application withIssueId(IssueId issueId) {
-        return new Application(id, deploymentSpec, validationOverrides, deployments, deploymentJobs.withIssueId(issueId), deploying, outstandingChange);
+    public Application with(IssueId issueId) {
+        return new Application(id, deploymentSpec, validationOverrides, deployments, deploymentJobs.with(issueId), deploying, outstandingChange);
     }
 
     public Application withJobCompletion(JobReport report, Instant notificationTime, Controller controller) {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
index d0417326e2d..0104b6b06a9 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
@@ -502,7 +502,7 @@ public class ApplicationController {
 
     public void setIssueId(ApplicationId id, IssueId issueId) {
         try (Lock lock = lock(id)) {
-            get(id).ifPresent(application -> store(application.withIssueId(issueId), lock));
+            get(id).ifPresent(application -> store(application.with(issueId), lock));
         }
     }
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentJobs.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentJobs.java
index 82ecef67520..68e0ce39c5c 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentJobs.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentJobs.java
@@ -83,7 +83,7 @@ public class DeploymentJobs {
         return new DeploymentJobs(Optional.of(projectId), status, issueId);
     }
 
-    public DeploymentJobs withIssueId(IssueId issueId) {
+    public DeploymentJobs with(IssueId issueId) {
         return new DeploymentJobs(projectId, status, Optional.ofNullable(issueId));
     }
 
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 30444f8bc93..cbe959c3e1a 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
@@ -1009,9 +1009,9 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
     private Slime toSlime(URI propertyUri, URI contactsUri, URI issueCreationUri, List<? extends List<? extends User>> contacts) {
         Slime slime = new Slime();
         Cursor root = slime.setObject();
-        root.setString("propertyUri", propertyUri.toString());
-        root.setString("contactsUri", contactsUri.toString());
-        root.setString("issueCreationUri", issueCreationUri.toString());
+        root.setString("propertyUrl", propertyUri.toString());
+        root.setString("contactsUrl", contactsUri.toString());
+        root.setString("issueCreationUrl", issueCreationUri.toString());
         Cursor lists = root.setArray("contacts");
         for (List<? extends User> contactList : contacts) {
             Cursor list = lists.addArray();
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/property-info.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/property-info.json
index 7af66764a15..cd996820c7e 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/property-info.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/property-info.json
@@ -1,7 +1,7 @@
 {
-    "propertyUri": "www.properties.com/1234",
-    "contactsUri": "www.contacts.com/1234",
-    "issueCreationUri": "www.issues.com/1234",
+    "propertyUri": "www.properties.tld/1234",
+    "contactsUri": "www.contacts.tld/1234",
+    "issueCreationUri": "www.issues.tld/1234",
     "contacts": [
         [
             "alice"