aboutsummaryrefslogtreecommitdiffstats
path: root/controller-api
diff options
context:
space:
mode:
authorOla Aunrønning <olaa@oath.com>2019-03-27 14:07:37 +0100
committerOla Aunrønning <olaa@oath.com>2019-03-27 14:07:37 +0100
commit8247353d3772d16f49ad7ca8cea9ef0e67e74214 (patch)
tree4128b0bafe628443353e725b00460bb31064c827 /controller-api
parent387df73c6b506ff1b0d250c295df81ecd2b5a8e5 (diff)
Added test. Misc fixes
Diffstat (limited to 'controller-api')
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/ResourceSnapshotConsumer.java2
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockResourceSnapshotConsumer.java11
2 files changed, 10 insertions, 3 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/ResourceSnapshotConsumer.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/ResourceSnapshotConsumer.java
index eeb42ff8f0f..eb7c4c79900 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/ResourceSnapshotConsumer.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/ResourceSnapshotConsumer.java
@@ -1,7 +1,7 @@
// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.hosted.controller.api.integration.resource;
-import com.yahoo.vespa.hosted.controller.api.identifiers.ApplicationId;
+import com.yahoo.config.provision.ApplicationId;
import java.util.Map;
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockResourceSnapshotConsumer.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockResourceSnapshotConsumer.java
index 4cd4665503d..d5d7b63e933 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockResourceSnapshotConsumer.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockResourceSnapshotConsumer.java
@@ -1,7 +1,7 @@
// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.hosted.controller.api.integration.stubs;
-import com.yahoo.vespa.hosted.controller.api.identifiers.ApplicationId;
+import com.yahoo.config.provision.ApplicationId;
import com.yahoo.vespa.hosted.controller.api.integration.resource.ResourceSnapshot;
import com.yahoo.vespa.hosted.controller.api.integration.resource.ResourceSnapshotConsumer;
@@ -12,7 +12,14 @@ import java.util.Map;
*/
public class MockResourceSnapshotConsumer implements ResourceSnapshotConsumer {
+ private Map<ApplicationId, ResourceSnapshot> resources;
+
@Override
- public void consume(Map<ApplicationId, ResourceSnapshot> resources){}
+ public void consume(Map<ApplicationId, ResourceSnapshot> resources){
+ this.resources = resources;
+ }
+ public Map<ApplicationId, ResourceSnapshot> consumedResources() {
+ return resources;
+ }
}