1 files changed, 38 insertions, 34 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocsumDefinitionSet.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocsumDefinitionSet.java
index 8d882adeb02..c9e771fe48c 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocsumDefinitionSet.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocsumDefinitionSet.java
@@ -1,6 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.prelude.fastsearch;
 
+import com.google.common.collect.ImmutableMap;
 import com.yahoo.slime.BinaryFormat;
 import com.yahoo.data.access.Inspector;
 import com.yahoo.slime.Slime;
@@ -10,9 +11,11 @@ import com.yahoo.container.search.LegacyEmulationConfig;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
-import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Map;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 
 import static com.yahoo.data.access.Type.OBJECT;
 
@@ -27,29 +30,44 @@ public final class DocsumDefinitionSet {
     public static final int SLIME_MAGIC_ID = 0x55555555;
     private final static Logger log = Logger.getLogger(DocsumDefinitionSet.class.getName());
 
-    private final HashMap<String, DocsumDefinition> definitionsByName = new HashMap<>();
+    private final Map<String, DocsumDefinition> definitionsByName;
     private final LegacyEmulationConfig emulationConfig;
 
     public DocsumDefinitionSet(DocumentdbInfoConfig.Documentdb config) {
-        this.emulationConfig = new LegacyEmulationConfig(new LegacyEmulationConfig.Builder());
-        configure(config);
+        this(config, new LegacyEmulationConfig(new LegacyEmulationConfig.Builder()));
     }
 
     public DocsumDefinitionSet(DocumentdbInfoConfig.Documentdb config, LegacyEmulationConfig emulConfig) {
+        this(toDocsums(config, emulConfig), emulConfig);
+    }
+
+    public DocsumDefinitionSet(Collection<DocsumDefinition> docsumDefinitions) {
+        this(docsumDefinitions, new LegacyEmulationConfig(new LegacyEmulationConfig.Builder()));
+    }
+
+    public DocsumDefinitionSet(Collection<DocsumDefinition> docsumDefinitions, LegacyEmulationConfig emulConfig) {
+        this.definitionsByName = ImmutableMap.copyOf(docsumDefinitions.stream().collect(Collectors.toMap(DocsumDefinition::getName, p -> p)));
         this.emulationConfig = emulConfig;
-        configure(config);
     }
 
+    LegacyEmulationConfig legacyEmulationConfig() { return emulationConfig; }
+
     /**
-     * Returns a docsum definition by name, or null if not found
+     * Returns the summary definition of the given name, or the default if not found.
      *
-     * @param name the name of the summary class to use, or null to use the name "default"
-     * @return the summary class found, or null if none
+     * @throws ConfigurationException if the requested summary class is not found and there is none called "default"
      */
-    public final DocsumDefinition getDocsumDefinition(String name) {
-        if (name == null)
-            name="default";
-        return definitionsByName.get(name);
+    public DocsumDefinition getDocsum(String summaryClass) {
+        DocsumDefinition ds = definitionsByName.get(summaryClass);
+        if (ds == null) {
+            ds = definitionsByName.get("default");
+        }
+        if (ds == null) {
+            throw new ConfigurationException("Fetched hit with summary class " + summaryClass +
+                                             ", but this summary class is not in current summary config (" + toString() + ")" +
+                                             " (that is, you asked for something unknown, and no default was found)");
+        }
+        return ds;
     }
 
     /**
@@ -68,7 +86,7 @@ public final class DocsumDefinitionSet {
         if (docsumClassId != SLIME_MAGIC_ID) {
             throw new IllegalArgumentException("Only expecting SchemaLess docsums - summary class:" + summaryClass + " hit:" + hit);
         }
-        DocsumDefinition docsumDefinition = lookupDocsum(summaryClass);
+        DocsumDefinition docsumDefinition = getDocsum(summaryClass);
         Slime value = BinaryFormat.decode(buffer.array(), buffer.arrayOffset()+buffer.position(), buffer.remaining());
         Inspector docsum = new SlimeAdapter(value.get());
         if (docsum.type() != OBJECT) {
@@ -78,19 +96,6 @@ public final class DocsumDefinitionSet {
         return null;
     }
 
-    private DocsumDefinition lookupDocsum(String summaryClass) {
-        DocsumDefinition ds = definitionsByName.get(summaryClass);
-        if (ds == null) {
-            ds = definitionsByName.get("default");
-        }
-        if (ds == null) {
-            throw new ConfigurationException("Fetched hit with summary class " + summaryClass +
-                    ", but this summary class is not in current summary config (" + toString() + ")" +
-                    " (that is, you asked for something unknown, and no default was found)");
-        }
-        return ds;
-    }
-
     public String toString() {
         StringBuilder sb = new StringBuilder();
         for (Map.Entry<String, DocsumDefinition> e : definitionsByName.entrySet() ) {
@@ -106,14 +111,13 @@ public final class DocsumDefinitionSet {
         return definitionsByName.size();
     }
 
-    private void configure(DocumentdbInfoConfig.Documentdb config) {
-        for (int i = 0; i < config.summaryclass().size(); ++i) {
-            DocumentdbInfoConfig.Documentdb.Summaryclass sc = config.summaryclass(i);
-            DocsumDefinition docSumDef = new DocsumDefinition(sc, emulationConfig);
-            definitionsByName.put(sc.name(), docSumDef);
-        }
-        if (definitionsByName.size() == 0) {
+    private static Collection<DocsumDefinition> toDocsums(DocumentdbInfoConfig.Documentdb config, LegacyEmulationConfig emulConfig) {
+        Collection<DocsumDefinition> docsums = new ArrayList<>();
+        for (int i = 0; i < config.summaryclass().size(); ++i)
+            docsums.add(new DocsumDefinition(config.summaryclass(i), emulConfig));
+        if (docsums.isEmpty())
             log.warning("No summary classes found in DocumentdbInfoConfig.Documentdb");
-        }
+        return docsums;
     }
+
 }