diff options
author | Håkon Hallingstad <hakon@oath.com> | 2018-05-31 16:08:48 +0200 |
---|---|---|
committer | Håkon Hallingstad <hakon@oath.com> | 2018-05-31 16:08:48 +0200 |
commit | 88384ecfa3a4baa4977c9763b069853f856469c6 (patch) | |
tree | 704b0c40762199abff832b076653d963c066e877 /service-monitor | |
parent | 293b7f898c22e67dccf64e48d62909d71e4aa896 (diff) |
Use ConfigServerUtil and fix copyright
Diffstat (limited to 'service-monitor')
3 files changed, 4 insertions, 19 deletions
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/DuperModelListener.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/DuperModelListener.java index f9d671ff7c6..235c7db5c36 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/DuperModelListener.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/DuperModelListener.java @@ -1,5 +1,5 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.service.monitor.internal;// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.vespa.service.monitor.internal; import com.yahoo.config.model.api.ApplicationInfo; import com.yahoo.config.model.api.SuperModel; diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/MonitorManager.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/MonitorManager.java index ac1aac9a990..1edf3a18215 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/MonitorManager.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/MonitorManager.java @@ -1,5 +1,5 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.service.monitor.internal;// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.vespa.service.monitor.internal; import com.yahoo.vespa.service.monitor.ServiceStatusProvider; diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/DuperModelTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/DuperModelTest.java index 1747ee439d3..0a68b4b0ff7 100644 --- a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/DuperModelTest.java +++ b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/DuperModelTest.java @@ -11,8 +11,6 @@ import org.junit.Test; import java.util.Collections; import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; @@ -24,25 +22,12 @@ import static org.mockito.Mockito.when; * @author hakon */ public class DuperModelTest { - private static final String configServer1 = "cfg1.yahoo.com"; - private static final String configServer2 = "cfg2.yahoo.com"; - private static final String configServer3 = "cfg3.yahoo.com"; - private static final List<String> configServerList = Stream.of( - configServer1, - configServer2, - configServer3).collect(Collectors.toList()); - private final ServiceStatusProvider statusProvider = mock(ServiceStatusProvider.class); @Test - public void toApplicationInstance() throws Exception { + public void toApplicationInstance() { when(statusProvider.getStatus(any(), any(), any(), any())).thenReturn(ServiceStatus.NOT_CHECKED); - ConfigserverConfig config = new ConfigserverConfig( - new ConfigserverConfig.Builder() - .hostedVespa(true) - .zookeeperserver(new ConfigserverConfig.Zookeeperserver.Builder().hostname(configServer1).port(1)) - .zookeeperserver(new ConfigserverConfig.Zookeeperserver.Builder().hostname(configServer2).port(2)) - .zookeeperserver(new ConfigserverConfig.Zookeeperserver.Builder().hostname(configServer3).port(3))); + ConfigserverConfig config = ConfigserverUtil.createExampleConfigserverConfig(true); DuperModel duperModel = new DuperModel(config); SuperModel superModel = mock(SuperModel.class); ApplicationInfo superModelApplicationInfo = mock(ApplicationInfo.class); |