Fixed scala type

2 files changed, 6 insertions, 4 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ClusterInfoMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ClusterInfoMaintainer.java
index f7284272b38..ad7fa90967b 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ClusterInfoMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ClusterInfoMaintainer.java
@@ -4,6 +4,7 @@ package com.yahoo.vespa.hosted.controller.maintenance;
 import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.Flavor;
 import com.yahoo.config.provision.Zone;
+import com.yahoo.config.provision.ZoneId;
 import com.yahoo.vespa.hosted.controller.Application;
 import com.yahoo.vespa.hosted.controller.Controller;
 import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId;
@@ -44,7 +45,7 @@ public class ClusterInfoMaintainer extends Maintainer {
         return node.membership.clusterId;
     }
 
-    private Map<ClusterSpec.Id, ClusterInfo> getClusterInfo(NodeList nodes, Zone zone) {
+    private Map<ClusterSpec.Id, ClusterInfo> getClusterInfo(NodeList nodes, ZoneId zone) {
         Map<ClusterSpec.Id, ClusterInfo> infoMap = new HashMap<>();
 
         // Group nodes by clusterid
@@ -63,7 +64,8 @@ public class ClusterInfoMaintainer extends Maintainer {
             double cpu = 0;
             double mem = 0;
             double disk = 0;
-            if (zone.nodeFlavors().isPresent()) {
+            // TODO: This code was never run. Reenable when flavours are available from a FlavorRegistry or something, or remove.
+            /*if (zone.nodeFlavors().isPresent()) {
                 Optional<Flavor> flavorOptional = zone.nodeFlavors().get().getFlavor(node.flavor);
                 if ((flavorOptional.isPresent())) {
                     Flavor flavor = flavorOptional.get();
@@ -71,7 +73,7 @@ public class ClusterInfoMaintainer extends Maintainer {
                     mem = flavor.getMinMainMemoryAvailableGb();
                     disk = flavor.getMinMainMemoryAvailableGb();
                 }
-            }
+            }*/
 
             // Add to map
             List<String> hostnames = clusterNodes.stream().map(node1 -> node1.hostname).collect(Collectors.toList());
diff --git a/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneContainerApplication.scala b/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneContainerApplication.scala
index 1d4b83ce7d3..e1d5ba6577d 100644
--- a/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneContainerApplication.scala
+++ b/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneContainerApplication.scala
@@ -158,7 +158,7 @@ object StandaloneContainerApplication {
     val logger = new BaseDeployLogger
     val rawApplicationPackage = new FilesApplicationPackage.Builder(applicationPath.toFile).includeSourceFiles(true).preprocessedDir(preprocessedApplicationDir).build()
     // TODO: Needed until we get rid of semantic rules
-    val applicationPackage = rawApplicationPackage.preprocess(Zone.defaultZone(), new RuleConfigDeriver {
+    val applicationPackage = rawApplicationPackage.preprocess(Zone.defaultZone().id, new RuleConfigDeriver {
       override def derive(ruleBaseDir: String, outputDir: String): Unit = {}
     }, logger)
     validateApplication(applicationPackage)