diff options
author | Jon Bratseth <bratseth@gmail.com> | 2021-02-09 19:04:25 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2021-02-09 19:04:25 +0100 |
commit | 7a9fe3fa0024c5dd995c1f48584bc7fab5284299 (patch) | |
tree | 0c0f12225835b99a1502cc1be156e33d67c65425 /athenz-identity-provider-service | |
parent | 893e6266501b37228d243460796d086219e79420 (diff) |
Remove getNodes(...): Always use list(...)
Diffstat (limited to 'athenz-identity-provider-service')
2 files changed, 5 insertions, 4 deletions
diff --git a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidator.java b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidator.java index 40782455025..9c5abb791cf 100644 --- a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidator.java +++ b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidator.java @@ -137,7 +137,7 @@ public class InstanceValidator { } // Find node matching vespa unique id - Node node = nodeRepository.nodes().getNodes().stream() + Node node = nodeRepository.nodes().list().stream() .filter(n -> n.allocation().isPresent()) .filter(n -> nodeMatchesVespaUniqueId(n, vespaUniqueInstanceId)) .findFirst() // Should be only one diff --git a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidatorTest.java b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidatorTest.java index 80bfda811d0..f2f76e58142 100644 --- a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidatorTest.java +++ b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidatorTest.java @@ -21,6 +21,7 @@ import com.yahoo.vespa.athenz.identityprovider.api.VespaUniqueInstanceId; import com.yahoo.vespa.athenz.identityprovider.client.IdentityDocumentSigner; import com.yahoo.vespa.hosted.athenz.instanceproviderservice.KeyProvider; import com.yahoo.vespa.hosted.provision.Node; +import com.yahoo.vespa.hosted.provision.NodeList; import com.yahoo.vespa.hosted.provision.NodeRepository; import com.yahoo.vespa.hosted.provision.node.IP; import com.yahoo.vespa.hosted.provision.node.Nodes; @@ -127,7 +128,7 @@ public class InstanceValidatorTest { List<Node> nodeList = createNodes(10); Node node = nodeList.get(0); nodeList = allocateNode(nodeList, node, applicationId); - when(nodes.getNodes()).thenReturn(nodeList); + when(nodes.list()).thenReturn(NodeList.copyOf(nodeList)); String nodeIp = node.ipConfig().primary().stream().findAny().orElseThrow(() -> new RuntimeException("No ipaddress for mocked node")); InstanceConfirmation instanceConfirmation = createRefreshInstanceConfirmation(applicationId, domain, service, ImmutableList.of(nodeIp)); @@ -145,7 +146,7 @@ public class InstanceValidatorTest { List<Node> nodeList = createNodes(10); Node node = nodeList.get(0); nodeList = allocateNode(nodeList, node, applicationId); - when(nodes.getNodes()).thenReturn(nodeList); + when(nodes.list()).thenReturn(NodeList.copyOf(nodeList)); String nodeIp = node.ipConfig().primary().stream().findAny().orElseThrow(() -> new RuntimeException("No ipaddress for mocked node")); // Add invalid ip to list of ip addresses @@ -164,7 +165,7 @@ public class InstanceValidatorTest { List<Node> nodeList = createNodes(10); - when(nodes.getNodes()).thenReturn(nodeList); + when(nodes.list()).thenReturn(NodeList.copyOf(nodeList)); InstanceConfirmation instanceConfirmation = createRefreshInstanceConfirmation(applicationId, domain, service, ImmutableList.of("::11")); assertFalse(instanceValidator.isValidRefresh(instanceConfirmation)); |