Simplfy: use the most convenient getConfig() method.

1 files changed, 7 insertions, 7 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyModelTester.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyModelTester.java
index 1132d53f2e8..8ecb13d7ae5 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyModelTester.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyModelTester.java
@@ -87,32 +87,32 @@ class MetricsProxyModelTester {
     }
 
     static ConsumersConfig consumersConfigFromModel(VespaModel model) {
-        return new ConsumersConfig((ConsumersConfig.Builder) model.getConfig(new ConsumersConfig.Builder(), CLUSTER_CONFIG_ID));
+        return model.getConfig(ConsumersConfig.class, CLUSTER_CONFIG_ID);
     }
 
     static MetricsNodesConfig getMetricsNodesConfig(VespaModel model) {
-        return new MetricsNodesConfig((MetricsNodesConfig.Builder) model.getConfig(new MetricsNodesConfig.Builder(), CLUSTER_CONFIG_ID));
+        return model.getConfig(MetricsNodesConfig.class, CLUSTER_CONFIG_ID);
     }
 
     static ApplicationDimensionsConfig getApplicationDimensionsConfig(VespaModel model) {
-        return new ApplicationDimensionsConfig((ApplicationDimensionsConfig.Builder) model.getConfig(new ApplicationDimensionsConfig.Builder(), CLUSTER_CONFIG_ID));
+        return model.getConfig(ApplicationDimensionsConfig.class, CLUSTER_CONFIG_ID);
     }
 
     static QrStartConfig getQrStartConfig(VespaModel model) {
-        return new QrStartConfig((QrStartConfig.Builder) model.getConfig(new QrStartConfig.Builder(), CLUSTER_CONFIG_ID));
+        return model.getConfig(QrStartConfig.class, CLUSTER_CONFIG_ID);
     }
 
     static NodeDimensionsConfig getNodeDimensionsConfig(VespaModel model, String configId) {
-        return new NodeDimensionsConfig((NodeDimensionsConfig.Builder) model.getConfig(new NodeDimensionsConfig.Builder(), configId));
+        return model.getConfig(NodeDimensionsConfig.class, configId);
     }
 
     static VespaServicesConfig getVespaServicesConfig(String servicesXml) {
         VespaModel model = getModel(servicesXml, self_hosted);
-        return new VespaServicesConfig((VespaServicesConfig.Builder) model.getConfig(new VespaServicesConfig.Builder(), CONTAINER_CONFIG_ID));
+        return model.getConfig(VespaServicesConfig.class, CONTAINER_CONFIG_ID);
     }
 
     static RpcConnectorConfig getRpcConnectorConfig(VespaModel model) {
-        return new RpcConnectorConfig((RpcConnectorConfig.Builder) model.getConfig(new RpcConnectorConfig.Builder(), CONTAINER_CONFIG_ID));
+        return model.getConfig(RpcConnectorConfig.class, CONTAINER_CONFIG_ID);
     }
 
 }