diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2022-04-04 16:40:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-04 16:40:47 +0200 |
| commit | 95ac1dbc727303ff50eaa93eb0ad68e0c76f5b65 (patch) | |
| tree | 3e61929ad7dceea1eb334d5855ad80dfbf9e51cd /node-repository | |
| parent | ad7cc1d11f0c19baa2344a643377576c559555f7 (diff) | |
Revert "Jonmv/reapply application name validation"
Diffstat (limited to 'node-repository')
2 files changed, 2 insertions, 6 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java index a9abc352d8c..379bb2566df 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java @@ -43,8 +43,8 @@ import java.util.logging.Logger; import java.util.stream.Collectors; import java.util.stream.IntStream; -import static com.yahoo.stream.CustomCollectors.toLinkedMap; import static java.util.stream.Collectors.collectingAndThen; +import static java.util.stream.Collectors.toMap; /** * Client which reads and writes nodes to a curator database. @@ -453,8 +453,7 @@ public class CuratorDatabaseClient { .map(this::readLoadBalancer) .filter(Optional::isPresent) .map(Optional::get) - .collect(collectingAndThen(toLinkedMap(LoadBalancer::id, - Function.identity()), + .collect(collectingAndThen(toMap(LoadBalancer::id, Function.identity()), Collections::unmodifiableMap)); } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializerTest.java index 48ee23c7b60..cc121ba8104 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializerTest.java @@ -334,9 +334,6 @@ public class NodeSerializerTest { " \"hostname\" : \"myHostname\",\n" + " \"ipAddresses\" : [\"127.0.0.1\"],\n" + " \"instance\": {\n" + - " \"tenantId\":\"t\",\n" + - " \"applicationId\":\"a\",\n" + - " \"instanceId\":\"i\",\n" + " \"serviceId\": \"content/myId/0/0/stateful\",\n" + " \"wantedVespaVersion\": \"6.42.2\"\n" + " }\n" + |