Merge pull request #17995 from vespa-engine/balder/gc-unused-code

2 files changed, 4 insertions, 23 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/SearchBuilder.java b/config-model/src/main/java/com/yahoo/searchdefinition/SearchBuilder.java
index 852fdc17726..a1ad727a01b 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/SearchBuilder.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/SearchBuilder.java
@@ -41,12 +41,12 @@ import java.util.List;
 public class SearchBuilder {
 
     private final DocumentTypeManager docTypeMgr = new DocumentTypeManager();
-    private List<Search> searchList = new LinkedList<>();
-    private ApplicationPackage app;
-    private boolean isBuilt = false;
-    private DocumentModel model = new DocumentModel();
+    private final ApplicationPackage app;
+    private final DocumentModel model = new DocumentModel();
     private final RankProfileRegistry rankProfileRegistry;
     private final QueryProfileRegistry queryProfileRegistry;
+    private List<Search> searchList = new LinkedList<>();
+    private boolean isBuilt = false;
 
     /** True to build the document aspect only, skipping instantiation of rank profiles */
     private final boolean documentsOnly;
@@ -134,15 +134,6 @@ public class SearchBuilder {
     }
 
     /**
-     * See #{@link #importReader}
-     *
-     * Convenience, should only be used for testing as logs will be swallowed.
-     */
-    public String importReader(NamedReader reader, String searchDefDir) throws IOException, ParseException {
-        return importString(IOUtils.readAll(reader), searchDefDir, new BaseDeployLogger());
-    }
-
-    /**
      * Import search definition.
      *
      * @param str the string to parse.
diff --git a/config-model/src/main/javacc/SDParser.jj b/config-model/src/main/javacc/SDParser.jj
index 8f99c388fb1..4823a6400f8 100644
--- a/config-model/src/main/javacc/SDParser.jj
+++ b/config-model/src/main/javacc/SDParser.jj
@@ -79,16 +79,6 @@ public class SDParser {
     private RankProfileRegistry rankProfileRegistry;
     private boolean documentsOnly;
 
-    /** For testing only */
-    public SDParser(String input, DeployLogger deployLogger) {
-        this(new SimpleCharStream(input), deployLogger);
-    }
-
-    /** For testing only */
-    public SDParser(SimpleCharStream stream, DeployLogger deployLogger) {
-        this(stream, deployLogger, MockApplicationPackage.createEmpty(), new RankProfileRegistry(), false);
-    }
-
     /**
      * Creates a parser
      *