Non-functional refactorings.

3 files changed, 3 insertions, 7 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java b/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java
index 93ff88f182b..4e9eb3bdb2e 100644
--- a/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java
+++ b/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java
@@ -107,7 +107,6 @@ public class ConfigModelRepo implements ConfigModelRepoAdder, Serializable, Iter
      * @param root The Root to set as parent for all plugins
      * @param servicesRoot XML root node of the services file
      */
-    @SuppressWarnings("deprecation")
     private void readConfigModels(ApplicationConfigProducerRoot root,
                                   Element servicesRoot,
                                   DeployState deployState,
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
index fe3e5960446..4db6b586868 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
@@ -17,6 +17,7 @@ import com.yahoo.vespa.model.ConfigSentinel;
 import com.yahoo.vespa.model.HostResource;
 import com.yahoo.vespa.model.Logd;
 import com.yahoo.vespa.model.admin.clustercontroller.ClusterControllerContainerCluster;
+import com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyContainerCluster;
 import com.yahoo.vespa.model.admin.monitoring.MetricsConsumer;
 import com.yahoo.vespa.model.admin.monitoring.Monitoring;
 import com.yahoo.vespa.model.admin.monitoring.builder.Metrics;
@@ -67,9 +68,7 @@ public class Admin extends AbstractConfigProducer implements Serializable {
      */
     private ClusterControllerContainerCluster clusterControllers;
 
-    /**
-     * Cluster for container that might be running on logserver hosts
-     */
+     // Cluster of logserver containers. If enabled, exactly one container is running on each logserver host.
     private Optional<LogserverContainerCluster> logServerContainerCluster = Optional.empty();
 
     private ZooKeepersConfigProvider zooKeepersConfigProvider;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
index e61c1226968..d7819f63f23 100755
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
@@ -323,9 +323,7 @@ public abstract class ContainerCluster<CONTAINER extends Container>
     }
 
     public void addContainers(Collection<CONTAINER> containers) {
-        for (var container : containers) {
-            addContainer(container);
-        }
+        containers.forEach(this::addContainer);
     }
 
     public void setProcessingChains(ProcessingChains processingChains, String... serverBindings) {