ResourceTagger differentiates shared hosts and infrastructure

2 files changed, 4 insertions, 4 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/MockResourceTagger.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/MockResourceTagger.java
index a74a362330b..0f05fa60db7 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/MockResourceTagger.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/MockResourceTagger.java
@@ -15,15 +15,15 @@ import java.util.Optional;
  */
 public class MockResourceTagger implements ResourceTagger {
 
-    Map<ZoneId, Map<HostName, Optional<ApplicationId>>> values = new HashMap<>();
+    Map<ZoneId, Map<HostName, ApplicationId>> values = new HashMap<>();
 
     @Override
-    public int tagResources(ZoneApi zone, Map<HostName, Optional<ApplicationId>> ownerOfHosts) {
+    public int tagResources(ZoneApi zone, Map<HostName, ApplicationId> ownerOfHosts) {
         values.put(zone.getId(), ownerOfHosts);
         return 0;
     }
 
-    public Map<ZoneId, Map<HostName, Optional<ApplicationId>>> getValues() {
+    public Map<ZoneId, Map<HostName, ApplicationId>> getValues() {
         return values;
     }
 }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/ResourceTagger.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/ResourceTagger.java
index 61f8a57ac8b..988949456bb 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/ResourceTagger.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/ResourceTagger.java
@@ -16,7 +16,7 @@ public interface ResourceTagger {
     /**
      * Returns number of tagged resources
      */
-    int tagResources(ZoneApi zone, Map<HostName, Optional<ApplicationId>> ownerOfHosts);
+    int tagResources(ZoneApi zone, Map<HostName, ApplicationId> ownerOfHosts);
 
     static ResourceTagger empty() {
         return (zone, tenantOfHosts) -> 0;