1 files changed, 1 insertions, 82 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/IndexFacts.java b/container-search/src/main/java/com/yahoo/prelude/IndexFacts.java
index 448d8e7855f..2fcd2466dd8 100644
--- a/container-search/src/main/java/com/yahoo/prelude/IndexFacts.java
+++ b/container-search/src/main/java/com/yahoo/prelude/IndexFacts.java
@@ -44,12 +44,8 @@ public class IndexFacts {
     /**
      * The name of the default search definition, which is the union of all
      * known document types.
-     * 
-     * @deprecated do not use
      */
-    // TODO: Make this package private in Vespa 7
-    @Deprecated // OK
-    public static final String unionName = "unionOfAllKnown";
+    static final String unionName = "unionOfAllKnown";
 
     /** A search definition which contains the union of all settings. */
     @SuppressWarnings("deprecation")
@@ -106,31 +102,6 @@ public class IndexFacts {
         return clusters != null ? clusters : Collections.<String>emptyList();
     }
 
-    /**
-     * Public only for testing.
-     *
-     * @deprecated set at creation time
-     */
-    // TODO: Remove on Vespa 7
-    @Deprecated // OK
-    public void setClusters(Map<String, List<String>> clusters) {
-        ensureNotFrozen();
-        this.clusters = clusters;
-        clusterByDocument = invert(clusters);
-    }
-
-    /**
-     * @deprecated set indexes at creation time instead
-     */
-    // TODO: Remove on Vespa 7
-    @Deprecated // OK
-    public void setSearchDefinitions(Map<String, SearchDefinition> searchDefinitions,
-                                     SearchDefinition unionSearchDefinition) {
-        ensureNotFrozen();
-        this.searchDefinitions = searchDefinitions;
-        this.unionSearchDefinition = unionSearchDefinition;
-    }
-
     private boolean isInitialized() {
         return searchDefinitions.size() > 0;
     }
@@ -312,58 +283,6 @@ public class IndexFacts {
         }
     }
 
-
-    /**
-     * Add a string to be accepted as an index name when parsing a
-     * query.
-     *
-     * For testing only.
-     *
-     * @param sdName name of search definition containing index, if null, modify default set
-     * @param indexName name of index, actual or otherwise
-     * @deprecated set indexes at creation time instead
-     */
-    // TODO: Remove on Vespa 7
-    @Deprecated // OK
-    public void addIndex(String sdName, String indexName) {
-        ensureNotFrozen();
-
-        SearchDefinition sd;
-        if (sdName == null) {
-            sd = unionSearchDefinition;
-        } else if (searchDefinitions.containsKey(sdName)) {
-            sd = searchDefinitions.get(sdName);
-        } else {
-            sd = new SearchDefinition(sdName);
-            searchDefinitions.put(sdName, sd);
-        }
-        sd.getOrCreateIndex(indexName);
-        unionSearchDefinition.getOrCreateIndex(indexName);
-    }
-
-    /**
-     * Adds an index to the specified index, and the default index settings,
-     * overriding any current settings for this index
-     * @deprecated set indexes at creation time instead
-     */
-    // TODO: Remove on Vespa 7
-    @Deprecated // OK
-    public void addIndex(String sdName, Index index) {
-        ensureNotFrozen();
-
-        SearchDefinition sd;
-        if (sdName == null) {
-            sd = unionSearchDefinition;
-        } else if (searchDefinitions.containsKey(sdName)) {
-            sd = searchDefinitions.get(sdName);
-        } else {
-            sd = new SearchDefinition(sdName);
-            searchDefinitions.put(sdName, sd);
-        }
-        sd.addIndex(index);
-        unionSearchDefinition.addIndex(index);
-    }
-
     public String getDefaultPosition(String sdName) {
         SearchDefinition sd;
         if (sdName == null) {