Merge with master

1 files changed, 0 insertions, 33 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/Deriver.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/Deriver.java
index e6b6c58cb38..133adb45dd9 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/Deriver.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/Deriver.java
@@ -3,7 +3,6 @@ package com.yahoo.searchdefinition.derived;
 import com.yahoo.document.DocumenttypesConfig;
 import com.yahoo.document.config.DocumentmanagerConfig;
 import com.yahoo.searchdefinition.SearchBuilder;
-import com.yahoo.searchdefinition.UnprocessingSearchBuilder;
 import com.yahoo.searchdefinition.parser.ParseException;
 import com.yahoo.vespa.configmodel.producers.DocumentManager;
 import com.yahoo.vespa.configmodel.producers.DocumentTypes;
@@ -18,25 +17,6 @@ import java.util.List;
  */
 public class Deriver {
 
-    /**
-     * Derives only document manager.
-     *
-     *
-     * @param sdFileNames The name of the search definition files to derive from.
-     * @param toDir       The directory to write configuration to.
-     * @return The list of Search objects, possibly "unproper ones", from sd files containing only document
-     */
-    public static SearchBuilder deriveDocuments(List<String> sdFileNames, String toDir) {
-        SearchBuilder builder = getUnprocessingSearchBuilder(sdFileNames);
-        DocumentmanagerConfig.Builder documentManagerCfg = new DocumentManager().produce(builder.getModel(), new DocumentmanagerConfig.Builder());
-        try {
-            DerivedConfiguration.exportDocuments(documentManagerCfg, toDir);
-        } catch (IOException e) {
-            throw new IllegalArgumentException(e);
-        }
-        return builder;
-    }
-
     public static SearchBuilder getSearchBuilder(List<String> sds) {
         SearchBuilder builder = new SearchBuilder();
         try {
@@ -50,19 +30,6 @@ public class Deriver {
         return builder;
     }
 
-    public static SearchBuilder getUnprocessingSearchBuilder(List<String> sds) {
-        SearchBuilder builder = new UnprocessingSearchBuilder();
-        try {
-            for (String s : sds) {
-                builder.importFile(s);
-            }
-        } catch (ParseException | IOException e) {
-            throw new IllegalArgumentException(e);
-        }
-        builder.build();
-        return builder;
-    }
-
     public static DocumentmanagerConfig.Builder getDocumentManagerConfig(String sd) {
         return getDocumentManagerConfig(Collections.singletonList(sd));
     }