diff options
author | Jon Bratseth <bratseth@oath.com> | 2020-03-13 19:11:52 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-13 19:11:52 +0100 |
commit | 7e92c3852e893d09f0aa821e04e4e9dbe83b4ab2 (patch) | |
tree | 2000cf21b1fe6e9b7f7b652605b3d1c070b63b87 /application | |
parent | 2685a6eb9cce2b3d2da1d2e2d4da195c414b4f7d (diff) | |
parent | 5a696133c325048ec2a29c9a971e8ab7d82fd362 (diff) |
Merge pull request #12563 from vespa-engine/bratseth/search-to-schema
Bratseth/search to schema
Diffstat (limited to 'application')
3 files changed, 10 insertions, 9 deletions
diff --git a/application/src/main/java/com/yahoo/application/Application.java b/application/src/main/java/com/yahoo/application/Application.java index b200244a21c..87e82a3fdeb 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.SEARCH_DEFINITIONS_DIR, name, ApplicationPackage.SD_NAME_SUFFIX); + Path path = nestedResource(ApplicationPackage.SCHEMAS_DIR, name, ApplicationPackage.SD_NAME_SUFFIX); createFile(path, searchDefinition); return this; } public Builder expressionInclude(String name, String searchDefinition) throws IOException { - Path path = nestedResource(ApplicationPackage.SEARCH_DEFINITIONS_DIR, name, ApplicationPackage.RANKEXPRESSION_NAME_SUFFIX); + Path path = nestedResource(ApplicationPackage.SCHEMAS_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.SEARCH_DEFINITIONS_DIR, name, ApplicationPackage.RANKEXPRESSION_NAME_SUFFIX); + Path path = nestedResource(ApplicationPackage.SCHEMAS_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 9d7cf2c8673..ac64ae188e5 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.SEARCH_DEFINITIONS_DIR, name, ApplicationPackage.SD_NAME_SUFFIX); + Path path = nestedResource(ApplicationPackage.SCHEMAS_DIR, name, ApplicationPackage.SD_NAME_SUFFIX); createFile(path, searchDefinition); return this; } public ApplicationBuilder rankExpression(String name, String rankExpressionContent) throws IOException { - Path path = nestedResource(ApplicationPackage.SEARCH_DEFINITIONS_DIR, name, ApplicationPackage.RANKEXPRESSION_NAME_SUFFIX); + Path path = nestedResource(ApplicationPackage.SCHEMAS_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 a4f566e2a71..a0c2ec9983b 100644 --- a/application/src/test/java/com/yahoo/application/ApplicationBuilderTest.java +++ b/application/src/test/java/com/yahoo/application/ApplicationBuilderTest.java @@ -32,9 +32,10 @@ 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"))); }); @@ -44,7 +45,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("searchdefinitions/myExpression.expression"))); + assertTrue(Files.exists(builder.getPath().resolve("schemas/myExpression.expression"))); }); } |