diff options
| -rw-r--r-- | config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigVerification.java | 14 | ||||
| -rw-r--r-- | configserver/src/test/java/com/yahoo/vespa/config/server/PortRangeAllocator.java | 5 |
2 files changed, 10 insertions, 9 deletions
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigVerification.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigVerification.java index 0399664faf2..bb864fa1708 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigVerification.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigVerification.java @@ -10,12 +10,13 @@ import org.apache.hc.client5.http.impl.classic.BasicHttpClientResponseHandler; import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; import java.io.IOException; +import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Collections; +import java.util.Deque; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.Stack; /** * Tool to verify that configs across multiple config servers are the same. @@ -42,17 +43,16 @@ public class ConfigVerification { } } - private static Map<String, Stack<String>> listConfigs(List<String> urls, CloseableHttpClient httpClient) throws IOException { + private static Map<String, Deque<String>> listConfigs(List<String> urls, CloseableHttpClient httpClient) throws IOException { Map<String, String> outputs = performRequests(urls, httpClient); - Map<String, Stack<String>> recurseMappings = new LinkedHashMap<>(); + Map<String, Deque<String>> recurseMappings = new LinkedHashMap<>(); for (Map.Entry<String, String> entry : outputs.entrySet()) { Slime slime = SlimeUtils.jsonToSlime(entry.getValue()); final List<String> list = new ArrayList<>(); slime.get().field("configs").traverse((ArrayTraverser) (idx, inspector) -> list.add(inspector.asString())); - Stack<String> stack = new Stack<>(); Collections.sort(list); - stack.addAll(list); + Deque<String> stack = new ArrayDeque<>(list); recurseMappings.put(entry.getKey(), stack); } return recurseMappings; @@ -66,10 +66,10 @@ public class ConfigVerification { return outputs; } - private static int compareConfigs(Map<String, Stack<String>> mappings, CloseableHttpClient httpClient) throws IOException { + private static int compareConfigs(Map<String, Deque<String>> mappings, CloseableHttpClient httpClient) throws IOException { for (int n = 0; n < mappings.values().iterator().next().size(); n++) { List<String> recurseUrls = new ArrayList<>(); - for (Map.Entry<String, Stack<String>> entry : mappings.entrySet()) { + for (Map.Entry<String, Deque<String>> entry : mappings.entrySet()) { recurseUrls.add(entry.getValue().pop()); } if ( ! equalOutputs(performRequests(recurseUrls, httpClient))) diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/PortRangeAllocator.java b/configserver/src/test/java/com/yahoo/vespa/config/server/PortRangeAllocator.java index 60a9dbc96db..4378c4cbd47 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/PortRangeAllocator.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/PortRangeAllocator.java @@ -5,9 +5,10 @@ import com.google.common.collect.ContiguousSet; import com.google.common.collect.DiscreteDomain; import com.google.common.collect.Range; +import java.util.ArrayDeque; +import java.util.Deque; import java.util.HashSet; import java.util.Set; -import java.util.Stack; /** * Allocates port ranges for all configserver tests. @@ -28,7 +29,7 @@ public class PortRangeAllocator { private static class PortRange { private final Set<Integer> takenPorts = new HashSet<>(); - private final Stack<Integer> freePorts = new Stack<>(); + private final Deque<Integer> freePorts = new ArrayDeque<>(); private static final int first = 18651; private static final int last = 18899; // see: factory/doc/port-ranges |