Merge pull request #10911 from vespa-engine/jvenstad/application-response-with-proper-instances

Explicit latest application versions and aggregate over instance in application response

2 files changed, 23 insertions, 14 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeploymentReference.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeploymentReference.java
new file mode 100644
index 00000000000..7971a3d0e0e
--- /dev/null
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeploymentReference.java
@@ -0,0 +1,20 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.vespa.hosted.controller.api.application.v4.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.yahoo.vespa.hosted.controller.api.identifiers.EnvironmentId;
+import com.yahoo.vespa.hosted.controller.api.identifiers.RegionId;
+
+import java.net.URI;
+
+/**
+ * @author jonmv
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class DeploymentReference {
+    public EnvironmentId environment;
+    public RegionId region;
+
+    public URI url;
+
+}
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/InstanceReference.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/InstanceReference.java
index 6ac27d0bad9..271deb6fe35 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/InstanceReference.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/InstanceReference.java
@@ -2,31 +2,20 @@
 package com.yahoo.vespa.hosted.controller.api.application.v4.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.yahoo.vespa.hosted.controller.api.bcp.BcpStatus;
-import com.yahoo.vespa.hosted.controller.api.identifiers.EnvironmentId;
 import com.yahoo.vespa.hosted.controller.api.identifiers.InstanceId;
-import com.yahoo.vespa.hosted.controller.api.identifiers.RegionId;
 
 import java.net.URI;
+import java.util.List;
 
 /**
  * @author mortent
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class InstanceReference {
-    public EnvironmentId environment;
-    public RegionId region;
+
+    public List<DeploymentReference> deployments;
     public InstanceId instance;
-    public BcpStatus bcpStatus;
 
     public URI url;
 
-    public static InstanceReference createInstanceReference(InstanceId instanceId, RegionId regionId, EnvironmentId environmentId, URI uri) {
-        InstanceReference instanceReference = new InstanceReference();
-        instanceReference.instance = instanceId;
-        instanceReference.region = regionId;
-        instanceReference.environment = environmentId;
-        instanceReference.url = uri;
-        return instanceReference;
-    }
 }