diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2020-12-23 12:56:32 +0100 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2020-12-30 11:59:56 +0100 |
| commit | 7efd5dfa1111e0aa94b97fbca06852de95258aa5 (patch) | |
| tree | 8e88711c3a6eb071f9c1db989f6a06c463879585 /vespaclient-container-plugin/src/main | |
| parent | 7bf09c3200422d047100362c82de6e1fdf2b323c (diff) | |
Replace use of [Storage... with [Content... and avoid overriding config id
Diffstat (limited to 'vespaclient-container-plugin/src/main')
| -rw-r--r-- | vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java index 5a370209f1c..add255a801e 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java @@ -948,18 +948,15 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler { static class StorageCluster { private final String name; - private final String configId; private final Map<String, String> documentBuckets; - StorageCluster(String name, String configId, Map<String, String> documentBuckets) { + StorageCluster(String name, Map<String, String> documentBuckets) { this.name = requireNonNull(name); - this.configId = requireNonNull(configId); this.documentBuckets = Map.copyOf(documentBuckets); } String name() { return name; } - String configId() { return configId; } - String route() { return "[Storage:cluster=" + name() + ";clusterconfigid=" + configId() + "]"; } + String route() { return "[Content:cluster=" + name() + "]"; } Optional<String> bucketOf(String documentType) { return Optional.ofNullable(documentBuckets.get(documentType)); } } @@ -968,7 +965,6 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler { return clusters.storage().stream() .collect(toUnmodifiableMap(storage -> storage.name(), storage -> new StorageCluster(storage.name(), - storage.configid(), buckets.cluster(storage.name()) .documentType().entrySet().stream() .collect(toMap(entry -> entry.getKey(), |