diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-05-28 20:35:45 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-05-28 20:35:45 +0200 |
commit | 8203f3361a8c711fd83e077a50f2b2ad6edaa3e9 (patch) | |
tree | 46677683f670a3f27a6620e006bd142812307959 /orchestrator | |
parent | 566e6fece1717a03af4f03eeadb50abff3d13031 (diff) |
Keep the spec final.
Create the address when needed in the async connect thread.
Implement hash/equal/compareTo for Spec to avoid toString.
Use Spec as key and avoid creating it every time.
Diffstat (limited to 'orchestrator')
2 files changed, 4 insertions, 4 deletions
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/InstanceResource.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/InstanceResource.java index 65ef1c9eaf0..bd265ed39e4 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/InstanceResource.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/InstanceResource.java @@ -105,7 +105,7 @@ public class InstanceResource { List<Mirror.Entry> entries = slobrokApi.lookup(applicationId, pattern); return entries.stream() - .map(entry -> new SlobrokEntryResponse(entry.getName(), entry.getSpec())) + .map(entry -> new SlobrokEntryResponse(entry.getName(), entry.getSpecString())) .collect(Collectors.toList()); } diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/resources/InstanceResourceTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/resources/InstanceResourceTest.java index 61102461bf0..ef6e26d2e99 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/resources/InstanceResourceTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/resources/InstanceResourceTest.java @@ -28,8 +28,8 @@ public class InstanceResourceTest { private static final ApplicationId APPLICATION_ID = ApplicationId.from( "tenant", "app", "instance"); private static final List<Mirror.Entry> ENTRIES = Arrays.asList( - new Mirror.Entry("name1", "spec1"), - new Mirror.Entry("name2", "spec2")); + new Mirror.Entry("name1", "tcp/spec:1"), + new Mirror.Entry("name2", "tcp/spec:2")); private static final ClusterId CLUSTER_ID = new ClusterId("cluster-id"); private final SlobrokApi slobrokApi = mock(SlobrokApi.class); @@ -85,7 +85,7 @@ public class InstanceResourceTest { ObjectMapper mapper = new ObjectMapper(); String actualJson = mapper.writeValueAsString(response); assertEquals( - "[{\"name\":\"name1\",\"spec\":\"spec1\"},{\"name\":\"name2\",\"spec\":\"spec2\"}]", + "[{\"name\":\"name1\",\"spec\":\"tcp/spec:1\"},{\"name\":\"name2\",\"spec\":\"tcp/spec:2\"}]", actualJson); } }
\ No newline at end of file |