Revert "Bratseth/search to schema"

3 files changed, 9 insertions, 10 deletions

diff --git a/application/src/main/java/com/yahoo/application/Application.java b/application/src/main/java/com/yahoo/application/Application.java
index 87e82a3fdeb..b200244a21c 100644
--- a/application/src/main/java/com/yahoo/application/Application.java
+++ b/application/src/main/java/com/yahoo/application/Application.java
@@ -254,13 +254,13 @@ public final class Application implements AutoCloseable {
          * @throws java.io.IOException e.g.if file not found
          */
         public Builder documentType(String name, String searchDefinition) throws IOException {
-            Path path = nestedResource(ApplicationPackage.SCHEMAS_DIR, name, ApplicationPackage.SD_NAME_SUFFIX);
+            Path path = nestedResource(ApplicationPackage.SEARCH_DEFINITIONS_DIR, name, ApplicationPackage.SD_NAME_SUFFIX);
             createFile(path, searchDefinition);
             return this;
         }
 
         public Builder expressionInclude(String name, String searchDefinition) throws IOException {
-            Path path = nestedResource(ApplicationPackage.SCHEMAS_DIR, name, ApplicationPackage.RANKEXPRESSION_NAME_SUFFIX);
+            Path path = nestedResource(ApplicationPackage.SEARCH_DEFINITIONS_DIR, name, ApplicationPackage.RANKEXPRESSION_NAME_SUFFIX);
             createFile(path, searchDefinition);
             return this;
         }
@@ -271,7 +271,7 @@ public final class Application implements AutoCloseable {
          * @throws java.io.IOException e.g.if file not found
          */
         public Builder rankExpression(String name, String rankExpressionContent) throws IOException {
-            Path path = nestedResource(ApplicationPackage.SCHEMAS_DIR, name, ApplicationPackage.RANKEXPRESSION_NAME_SUFFIX);
+            Path path = nestedResource(ApplicationPackage.SEARCH_DEFINITIONS_DIR, name, ApplicationPackage.RANKEXPRESSION_NAME_SUFFIX);
             createFile(path, rankExpressionContent);
             return this;
         }
diff --git a/application/src/main/java/com/yahoo/application/ApplicationBuilder.java b/application/src/main/java/com/yahoo/application/ApplicationBuilder.java
index ac64ae188e5..9d7cf2c8673 100644
--- a/application/src/main/java/com/yahoo/application/ApplicationBuilder.java
+++ b/application/src/main/java/com/yahoo/application/ApplicationBuilder.java
@@ -37,13 +37,13 @@ public class ApplicationBuilder {
     }
 
     public ApplicationBuilder documentType(String name, String searchDefinition) throws IOException {
-        Path path = nestedResource(ApplicationPackage.SCHEMAS_DIR, name, ApplicationPackage.SD_NAME_SUFFIX);
+        Path path = nestedResource(ApplicationPackage.SEARCH_DEFINITIONS_DIR, name, ApplicationPackage.SD_NAME_SUFFIX);
         createFile(path, searchDefinition);
         return this;
     }
 
     public ApplicationBuilder rankExpression(String name, String rankExpressionContent) throws IOException {
-        Path path = nestedResource(ApplicationPackage.SCHEMAS_DIR, name, ApplicationPackage.RANKEXPRESSION_NAME_SUFFIX);
+        Path path = nestedResource(ApplicationPackage.SEARCH_DEFINITIONS_DIR, name, ApplicationPackage.RANKEXPRESSION_NAME_SUFFIX);
         createFile(path, rankExpressionContent);
         return this;
     }
diff --git a/application/src/test/java/com/yahoo/application/ApplicationBuilderTest.java b/application/src/test/java/com/yahoo/application/ApplicationBuilderTest.java
index a0c2ec9983b..a4f566e2a71 100644
--- a/application/src/test/java/com/yahoo/application/ApplicationBuilderTest.java
+++ b/application/src/test/java/com/yahoo/application/ApplicationBuilderTest.java
@@ -32,10 +32,9 @@ public class ApplicationBuilderTest {
     @Test
     public void query_profile_can_be_added() throws Exception {
         withApplicationBuilder(builder -> {
-            builder.queryProfile("MyProfile",
-                                 "<query-profile id=\"MyProfile\">" +
-                                 "<field name=\"message\">Hello world!</field>" +
-                                 "</query-profile>");
+            builder.queryProfile("MyProfile", "<query-profile id=\"MyProfile\">" + //
+            "<field name=\"message\">Hello world!</field>" + //
+            "</query-profile>");
 
             assertTrue(Files.exists(builder.getPath().resolve("search/query-profiles/MyProfile.xml")));
         });
@@ -45,7 +44,7 @@ public class ApplicationBuilderTest {
     public void rank_expression_can_be_added() throws Exception {
         withApplicationBuilder(builder -> {
             builder.rankExpression("myExpression", "content");
-            assertTrue(Files.exists(builder.getPath().resolve("schemas/myExpression.expression")));
+            assertTrue(Files.exists(builder.getPath().resolve("searchdefinitions/myExpression.expression")));
         });
     }