From 3a0540731949fed54990de5d9b51927b3f262d0f Mon Sep 17 00:00:00 2001 From: Håkon Hallingstad Date: Fri, 6 Mar 2020 17:06:03 +0100 Subject: Remove service model cache --- .../test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java | 5 +---- .../test/java/com/yahoo/vespa/orchestrator/model/ModelTestUtils.java | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'orchestrator') diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java index c5c5bd1e625..44e11fb794b 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java @@ -30,7 +30,6 @@ import com.yahoo.vespa.orchestrator.status.ApplicationLock; import com.yahoo.vespa.orchestrator.status.HostStatus; import com.yahoo.vespa.orchestrator.status.StatusService; import com.yahoo.vespa.orchestrator.status.ZkStatusService; -import com.yahoo.vespa.service.model.ServiceModelCache; import com.yahoo.vespa.service.monitor.ServiceModel; import com.yahoo.vespa.service.monitor.ServiceMonitor; import org.junit.Before; @@ -421,9 +420,7 @@ public class OrchestratorImplTest { hostName, ServiceStatus.NOT_CHECKED))))); - ServiceMonitor serviceMonitor = new ServiceModelCache( - () -> new ServiceModel(Map.of(reference, applicationInstance)), - new TestTimer()); + ServiceMonitor serviceMonitor = () -> new ServiceModel(Map.of(reference, applicationInstance)); orchestrator = new OrchestratorImpl(new HostedVespaPolicy(new HostedVespaClusterPolicy(), clusterControllerClientFactory, applicationApiFactory), clusterControllerClientFactory, diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ModelTestUtils.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ModelTestUtils.java index 197a2a03984..e6a14f75b24 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ModelTestUtils.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ModelTestUtils.java @@ -31,7 +31,6 @@ import com.yahoo.vespa.orchestrator.status.HostInfos; import com.yahoo.vespa.orchestrator.status.HostStatus; import com.yahoo.vespa.orchestrator.status.StatusService; import com.yahoo.vespa.orchestrator.status.ZkStatusService; -import com.yahoo.vespa.service.model.ServiceModelCache; import com.yahoo.vespa.service.monitor.ServiceModel; import com.yahoo.vespa.service.monitor.ServiceMonitor; import com.yahoo.yolean.Exceptions; @@ -60,7 +59,7 @@ class ModelTestUtils { private final Map hostStatusMap = new HashMap<>(); private final StatusService statusService = new ZkStatusService(new MockCurator(), mock(Metric.class), new TestTimer(), flagSource); private final TestTimer timer = new TestTimer(); - private final ServiceMonitor serviceMonitor = new ServiceModelCache(() -> new ServiceModel(applications), timer); + private final ServiceMonitor serviceMonitor = () -> new ServiceModel(applications); private final Orchestrator orchestrator = new OrchestratorImpl(new HostedVespaPolicy(new HostedVespaClusterPolicy(), clusterControllerClientFactory, applicationApiFactory()), clusterControllerClientFactory, statusService, -- cgit v1.2.3