Remove unused state and methods

2 files changed, 9 insertions, 23 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 6f965a61b16..9962c804b7e 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
@@ -26,7 +26,6 @@ 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<Long, DocsumDefinition> definitions = new HashMap<>();
     private final HashMap<String, DocsumDefinition> definitionsByName = new HashMap<>();
     private final LegacyEmulationConfig emulationConfig;
 
@@ -40,14 +39,6 @@ public final class DocsumDefinitionSet {
         configure(config);
     }
 
-    /** Returns a docsum definition by id
-     * @param id document summary class id
-     * @return a DocsumDefinition for the id, if found.
-     */
-    public final DocsumDefinition getDocsumDefinition(long id) {
-        return definitions.get(new Long(id));
-    }
-
     /**
      * Returns a docsum definition by name, or null if not found
      *
@@ -95,32 +86,27 @@ public final class DocsumDefinitionSet {
 
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        Set<Map.Entry<Long, DocsumDefinition>> entrySet = definitions.entrySet();
         boolean first = true;
-        for (Iterator<Map.Entry<Long, DocsumDefinition>> itr = entrySet.iterator(); itr.hasNext(); ) {
-            if (!first) {
+        for (Map.Entry<String, DocsumDefinition> e : definitionsByName.entrySet() ) {
+            if (sb.length() != 0) {
                 sb.append(",");
-            } else {
-                first = false;
             }
-            Map.Entry<Long, DocsumDefinition> entry = itr.next();
-            sb.append("[").append(entry.getKey()).append(",").append(entry.getValue().getName()).append("]");
+            sb.append("[").append(e.getKey()).append(",").append(e.getValue().getName()).append("]");
         }
         return sb.toString();
     }
 
     public int size() {
-        return definitions.size();
+        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);
-            definitions.put((long) sc.id(), docSumDef);
             definitionsByName.put(sc.name(), docSumDef);
         }
-        if (definitions.size() == 0) {
+        if (definitionsByName.size() == 0) {
             log.warning("No summary classes found in DocumentdbInfoConfig.Documentdb");
         }
     }
diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/DocsumDefinitionTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/DocsumDefinitionTestCase.java
index 7e2c947ac8f..132f15d2061 100644
--- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/DocsumDefinitionTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/DocsumDefinitionTestCase.java
@@ -35,16 +35,16 @@ public class DocsumDefinitionTestCase extends junit.framework.TestCase {
         String summary_cf = "file:src/test/java/com/yahoo/prelude/fastsearch/test/documentdb-info.cfg";
         DocsumDefinitionSet set = createDocsumDefinitionSet(summary_cf);
 
-        String[] defs = new String[] { "[0,default]", "[1,version1]",
-                "[237,withranklog]", "[2,version2]", "[3,version3]",
-                "[4,version4]", "[5,version5]" };
+        String[] defs = new String[] { "[default,default]", "[version1,version1]",
+                "[withranklog,withranklog]", "[version2,version2]", "[version3,version3]",
+                "[version4,version4]", "[version5,version5]" };
         String setAsString = set.toString();
         for (String d : defs) {
             assertFalse(setAsString.indexOf(d) == -1);
         }
         assertEquals(7, set.size());
 
-        DocsumDefinition docsum0 = set.getDocsumDefinition(0);
+        DocsumDefinition docsum0 = set.getDocsumDefinition("default");
 
         assertNotNull(docsum0);
         assertEquals("default", docsum0.getName());