diff options
3 files changed, 17 insertions, 22 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java index 93b67407933..ab748dc1fd1 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java @@ -223,16 +223,6 @@ public class MetricsProxyContainerCluster extends ContainerCluster<MetricsProxyC .orElse(Collections.emptyMap()); } - private Optional<Admin> getAdmin() { - if (parent != null) { - AbstractConfigProducerRoot r = parent.getRoot(); - if (r instanceof VespaModel model) { - return Optional.ofNullable(model.getAdmin()); - } - } - return Optional.empty(); - } - private Optional<String> getSystemName() { Monitoring monitoring = getMonitoringService(); return monitoring != null && ! monitoring.getClustername().equals("") ? diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java index db43dfc0beb..ec1776730b8 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java @@ -127,18 +127,10 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat } private void wireLogctlSpecs() { - var parent = getParent(); - if (parent != null) { - var r = parent.getRoot(); - if (r instanceof VespaModel model) { - var admin = model.getAdmin(); - if (admin != null) { - for (var c : getContainers()) { - c.setLogctlSpecs(admin.getLogctlSpecs()); - } - } - } - } + getAdmin().ifPresent(admin -> { + for (var c : getContainers()) { + c.setLogctlSpecs(admin.getLogctlSpecs()); + }}); } @Override 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 f1b3c74a55d..f94c3be25bb 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 @@ -36,6 +36,8 @@ import com.yahoo.search.query.profile.config.QueryProfilesConfig; import com.yahoo.vespa.configdefinition.IlscriptsConfig; import com.yahoo.vespa.model.PortsMeta; import com.yahoo.vespa.model.Service; +import com.yahoo.vespa.model.VespaModel; +import com.yahoo.vespa.model.admin.Admin; import com.yahoo.vespa.model.admin.monitoring.Monitoring; import com.yahoo.vespa.model.clients.ContainerDocumentApi; import com.yahoo.vespa.model.container.component.AccessLogComponent; @@ -208,6 +210,17 @@ public abstract class ContainerCluster<CONTAINER extends Container> return zone; } + protected Optional<Admin> getAdmin() { + var parent = getParent(); + if (parent != null) { + var r = parent.getRoot(); + if (r instanceof VespaModel model) { + return Optional.ofNullable(model.getAdmin()); + } + } + return Optional.empty(); + } + public void addDefaultHandlersWithVip() { addDefaultHandlersExceptStatus(); addVipHandler(); |