Move any single set_language operation to the top

1 files changed, 8 insertions, 6 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 1fab30f9ea4..779ae54c242 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/SearchBuilder.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/SearchBuilder.java
@@ -396,23 +396,25 @@ public class SearchBuilder {
         return builder;
     }
 
-    public static SearchBuilder createFromDirectory(String dir) throws IOException, ParseException {
-        return createFromDirectory(dir, new RankProfileRegistry());
+    public static SearchBuilder createFromDirectory(String dir, DeployLogger logger) throws IOException, ParseException {
+        return createFromDirectory(dir, new RankProfileRegistry(), logger);
     }
     public static SearchBuilder createFromDirectory(String dir,
-                                                    RankProfileRegistry rankProfileRegistry) throws IOException, ParseException {
-        return createFromDirectory(dir, rankProfileRegistry, createQueryProfileRegistryFromDirectory(dir));
+                                                    RankProfileRegistry rankProfileRegistry,
+                                                    DeployLogger logger) throws IOException, ParseException {
+        return createFromDirectory(dir, rankProfileRegistry, createQueryProfileRegistryFromDirectory(dir), logger);
     }
     public static SearchBuilder createFromDirectory(String dir,
                                                     RankProfileRegistry rankProfileRegistry,
-                                                    QueryProfileRegistry queryProfileRegistry) throws IOException, ParseException {
+                                                    QueryProfileRegistry queryProfileRegistry,
+                                                    DeployLogger logger) throws IOException, ParseException {
         SearchBuilder builder = new SearchBuilder(MockApplicationPackage.fromSearchDefinitionDirectory(dir),
                                                   rankProfileRegistry,
                                                   queryProfileRegistry);
         for (Iterator<Path> i = Files.list(new File(dir).toPath()).filter(p -> p.getFileName().toString().endsWith(".sd")).iterator(); i.hasNext(); ) {
             builder.importFile(i.next());
         }
-        builder.build(true, new BaseDeployLogger());
+        builder.build(true, logger);
         return builder;
     }