Merge pull request #18081 from vespa-engine/hmusum/warn-when-using-searchdefinitions-dir

Validate that schemas/ dir is used for schemas, warns otherwise

2 files changed, 20 insertions, 4 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java
index f5250343afe..a3f7e973508 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java
@@ -216,7 +216,7 @@ public class VespaModelTestCase {
                         "</hosts>");
     }
 
-    class MyLogger implements DeployLogger {
+    static class MyLogger implements DeployLogger {
         List<Pair<Level, String>> msgs = new ArrayList<>();
         @Override
         public void log(Level level, String message) {
@@ -305,4 +305,21 @@ public class VespaModelTestCase {
         assertThat(model.getContainerClusters().size(), is(1));
     }
 
+    @Test
+    public void testThatDeployLogContainsWarninnWhenUsingSearchdefinitionsDir() throws IOException, SAXException {
+        ApplicationPackage app = FilesApplicationPackage.fromFile(
+                new File("src/test/cfg/application/app_qrserverandgw/"));
+        MyLogger logger = new MyLogger();
+        DeployState deployState = new DeployState.Builder()
+                .applicationPackage(app)
+                .deployLogger(logger)
+                .build();
+        VespaModel model = new VespaModel(new NullConfigModelRegistry(), deployState);
+        Validation.validate(model, new ValidationParameters(), deployState);
+
+        assertEquals(3, logger.msgs.size());
+        assertEquals("WARNING", logger.msgs.get(1).getFirst().getName());
+        assertEquals("Directory searchdefinitions/ should not be used for schemas, use schemas/ instead", logger.msgs.get(1).getSecond());
+    }
+
 }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/utils/VespaModelCreatorWithFilePkg.java b/config-model/src/test/java/com/yahoo/vespa/model/test/utils/VespaModelCreatorWithFilePkg.java
index 8147d2e00ca..eea3da0e096 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/utils/VespaModelCreatorWithFilePkg.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/utils/VespaModelCreatorWithFilePkg.java
@@ -24,9 +24,8 @@ import java.io.IOException;
  */
 public class VespaModelCreatorWithFilePkg {
 
-    private FilesApplicationPackage applicationPkg;
-
-    private ConfigModelRegistry configModelRegistry;
+    private final FilesApplicationPackage applicationPkg;
+    private final ConfigModelRegistry configModelRegistry;
 
     public VespaModelCreatorWithFilePkg(String directoryName) {
         this(new File(directoryName));