diff options
| author | Harald Musum <musum@oath.com> | 2018-11-05 14:54:52 +0100 |
|---|---|---|
| committer | Harald Musum <musum@oath.com> | 2018-11-05 17:43:05 +0100 |
| commit | 6630d84ae7856c26c00f5f1d10e1c0a3e304170f (patch) | |
| tree | 1f55749a8d903398069a2ea6e95f5a45c783406d /service-monitor | |
| parent | e5d0e505d22f728ff97da039c6eceb5860147511 (diff) | |
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)
Diffstat (limited to 'service-monitor')
| -rw-r--r-- | service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/ExampleModel.java | 9 |
1 files changed, 3 insertions, 6 deletions
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<TenantName, Map<ApplicationId, ApplicationInfo>> applicationInfos = new HashMap<>(); - applicationInfos.put(applicationInfo.getApplicationId().tenant(), new HashMap<>()); - applicationInfos.get(applicationInfo.getApplicationId().tenant()) - .put(applicationInfo.getApplicationId(), applicationInfo); - return new SuperModel(applicationInfos); + Map<ApplicationId, ApplicationInfo> applicationInfos = new HashMap<>(); + applicationInfos.put(applicationInfo.getApplicationId(), applicationInfo); + return new SuperModel(applicationInfos, false); } public static ApplicationBuilder createApplication(String tenant, |