From 6630d84ae7856c26c00f5f1d10e1c0a3e304170f Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Mon, 5 Nov 2018 14:54:52 +0100 Subject: Use simpler map for models Need to keep old constructor and make a temporary one with an ignored argument to make this work (since arguments will be equal due to type erasure) --- .../com/yahoo/vespa/service/monitor/internal/ExampleModel.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'service-monitor/src') diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/ExampleModel.java b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/ExampleModel.java index 186b22cf4ec..7341c817747 100644 --- a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/ExampleModel.java +++ b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/ExampleModel.java @@ -9,7 +9,6 @@ import com.yahoo.config.model.api.ServiceInfo; import com.yahoo.config.model.api.SuperModel; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.InstanceName; -import com.yahoo.config.provision.TenantName; import com.yahoo.vespa.service.monitor.internal.slobrok.SlobrokMonitor; import java.util.ArrayList; @@ -45,11 +44,9 @@ public class ExampleModel { .then() .build(); - Map> applicationInfos = new HashMap<>(); - applicationInfos.put(applicationInfo.getApplicationId().tenant(), new HashMap<>()); - applicationInfos.get(applicationInfo.getApplicationId().tenant()) - .put(applicationInfo.getApplicationId(), applicationInfo); - return new SuperModel(applicationInfos); + Map applicationInfos = new HashMap<>(); + applicationInfos.put(applicationInfo.getApplicationId(), applicationInfo); + return new SuperModel(applicationInfos, false); } public static ApplicationBuilder createApplication(String tenant, -- cgit v1.2.3