aboutsummaryrefslogtreecommitdiffstats
path: root/config-model/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'config-model/src/main')
-rw-r--r--config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java4
-rw-r--r--config-model/src/main/java/com/yahoo/config/model/deploy/SearchDocumentModel.java6
-rw-r--r--config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java6
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/SchemaBuilder.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/SearchBuilder.java)88
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/derived/Deriver.java6
5 files changed, 55 insertions, 55 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java
index 4790b9e8d27..dac62ce7e1b 100644
--- a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java
+++ b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java
@@ -30,7 +30,7 @@ import com.yahoo.config.provision.Zone;
import com.yahoo.io.IOUtils;
import com.yahoo.io.reader.NamedReader;
import com.yahoo.searchdefinition.RankProfileRegistry;
-import com.yahoo.searchdefinition.SearchBuilder;
+import com.yahoo.searchdefinition.SchemaBuilder;
import com.yahoo.searchdefinition.parser.ParseException;
import com.yahoo.vespa.config.ConfigDefinition;
import com.yahoo.vespa.config.ConfigDefinitionBuilder;
@@ -475,7 +475,7 @@ public class DeployState implements ConfigDefinitionStore {
ValidationParameters validationParameters) {
Collection<NamedReader> readers = applicationPackage.getSchemas();
Map<String, String> names = new LinkedHashMap<>();
- SearchBuilder builder = new SearchBuilder(applicationPackage, fileRegistry, logger, properties, rankProfileRegistry, queryProfiles.getRegistry());
+ SchemaBuilder builder = new SchemaBuilder(applicationPackage, fileRegistry, logger, properties, rankProfileRegistry, queryProfiles.getRegistry());
for (NamedReader reader : readers) {
try {
String readerName = reader.getName();
diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/SearchDocumentModel.java b/config-model/src/main/java/com/yahoo/config/model/deploy/SearchDocumentModel.java
index 604e2b0a44b..b7a44ef2c73 100644
--- a/config-model/src/main/java/com/yahoo/config/model/deploy/SearchDocumentModel.java
+++ b/config-model/src/main/java/com/yahoo/config/model/deploy/SearchDocumentModel.java
@@ -2,7 +2,7 @@
package com.yahoo.config.model.deploy;
import com.yahoo.searchdefinition.Schema;
-import com.yahoo.searchdefinition.SearchBuilder;
+import com.yahoo.searchdefinition.SchemaBuilder;
import com.yahoo.vespa.documentmodel.DocumentModel;
import com.yahoo.vespa.model.search.NamedSchema;
@@ -34,7 +34,7 @@ public class SearchDocumentModel {
return schemas;
}
- public static SearchDocumentModel fromBuilderAndNames(SearchBuilder builder, Map<String, String> names) {
+ public static SearchDocumentModel fromBuilderAndNames(SchemaBuilder builder, Map<String, String> names) {
List<NamedSchema> ret = new ArrayList<>();
for (Schema schema : builder.getSearchList()) {
ret.add(new NamedSchema(names.get(schema.getName()), schema));
@@ -42,7 +42,7 @@ public class SearchDocumentModel {
return new SearchDocumentModel(builder.getModel(), ret);
}
- public static SearchDocumentModel fromBuilder(SearchBuilder builder) {
+ public static SearchDocumentModel fromBuilder(SchemaBuilder builder) {
List<NamedSchema> ret = new ArrayList<>();
for (Schema schema : builder.getSearchList()) {
ret.add(new NamedSchema(schema.getName(), schema));
diff --git a/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java b/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java
index 1ef5dcef411..5822b1bca05 100644
--- a/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java
+++ b/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java
@@ -19,7 +19,7 @@ import com.yahoo.io.reader.NamedReader;
import com.yahoo.search.query.profile.QueryProfileRegistry;
import com.yahoo.search.query.profile.config.QueryProfileXMLReader;
import com.yahoo.searchdefinition.RankProfileRegistry;
-import com.yahoo.searchdefinition.SearchBuilder;
+import com.yahoo.searchdefinition.SchemaBuilder;
import com.yahoo.searchdefinition.parser.ParseException;
import com.yahoo.vespa.config.ConfigDefinitionKey;
import com.yahoo.config.application.api.ApplicationPackage;
@@ -118,7 +118,7 @@ public class MockApplicationPackage implements ApplicationPackage {
@Override
public List<NamedReader> getSchemas() {
ArrayList<NamedReader> readers = new ArrayList<>();
- SearchBuilder searchBuilder = new SearchBuilder(this,
+ SchemaBuilder schemaBuilder = new SchemaBuilder(this,
new MockFileRegistry(),
new BaseDeployLogger(),
new TestProperties(),
@@ -126,7 +126,7 @@ public class MockApplicationPackage implements ApplicationPackage {
queryProfileRegistry);
for (String sd : schemas) {
try {
- String name = searchBuilder.importString(sd);
+ String name = schemaBuilder.importString(sd);
readers.add(new NamedReader(name + ApplicationPackage.SD_NAME_SUFFIX, new StringReader(sd)));
} catch (ParseException e) {
throw new RuntimeException(e);
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/SearchBuilder.java b/config-model/src/main/java/com/yahoo/searchdefinition/SchemaBuilder.java
index dc5ab752f31..a2d7fdd8fe5 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/SearchBuilder.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/SchemaBuilder.java
@@ -45,8 +45,8 @@ import java.util.Set;
* expressions, using the setRankXXX() methods, 3) invoke the {@link #build()} method, and 4) retrieve the built
* search objects using the {@link #getSearch(String)} method.
*/
-// Since this was created we have added Application, and much of the content in this should probably migrate there.
-public class SearchBuilder {
+// NOTE: Since this was created we have added Application, and much of the content in this should migrate there.
+public class SchemaBuilder {
private final DocumentTypeManager docTypeMgr = new DocumentTypeManager();
private final DocumentModel model = new DocumentModel();
@@ -64,49 +64,49 @@ public class SearchBuilder {
private final Set<Class<? extends Processor>> processorsToSkip = new HashSet<>();
/** For testing only */
- public SearchBuilder() {
+ public SchemaBuilder() {
this(new RankProfileRegistry(), new QueryProfileRegistry());
}
/** For testing only */
- public SearchBuilder(DeployLogger deployLogger) {
+ public SchemaBuilder(DeployLogger deployLogger) {
this(MockApplicationPackage.createEmpty(), deployLogger);
}
/** For testing only */
- public SearchBuilder(DeployLogger deployLogger, RankProfileRegistry rankProfileRegistry) {
+ public SchemaBuilder(DeployLogger deployLogger, RankProfileRegistry rankProfileRegistry) {
this(MockApplicationPackage.createEmpty(), deployLogger, rankProfileRegistry);
}
/** Used for generating documents for typed access to document fields in Java */
- public SearchBuilder(boolean documentsOnly) {
+ public SchemaBuilder(boolean documentsOnly) {
this(MockApplicationPackage.createEmpty(), new MockFileRegistry(), new BaseDeployLogger(), new TestProperties(), new RankProfileRegistry(), new QueryProfileRegistry(), documentsOnly);
}
/** For testing only */
- public SearchBuilder(ApplicationPackage app, DeployLogger deployLogger) {
+ public SchemaBuilder(ApplicationPackage app, DeployLogger deployLogger) {
this(app, new MockFileRegistry(), deployLogger, new TestProperties(), new RankProfileRegistry(), new QueryProfileRegistry());
}
/** For testing only */
- public SearchBuilder(ApplicationPackage app, DeployLogger deployLogger, RankProfileRegistry rankProfileRegistry) {
+ public SchemaBuilder(ApplicationPackage app, DeployLogger deployLogger, RankProfileRegistry rankProfileRegistry) {
this(app, new MockFileRegistry(), deployLogger, new TestProperties(), rankProfileRegistry, new QueryProfileRegistry());
}
/** For testing only */
- public SearchBuilder(RankProfileRegistry rankProfileRegistry) {
+ public SchemaBuilder(RankProfileRegistry rankProfileRegistry) {
this(rankProfileRegistry, new QueryProfileRegistry());
}
/** For testing only */
- public SearchBuilder(RankProfileRegistry rankProfileRegistry, QueryProfileRegistry queryProfileRegistry) {
+ public SchemaBuilder(RankProfileRegistry rankProfileRegistry, QueryProfileRegistry queryProfileRegistry) {
this(rankProfileRegistry, queryProfileRegistry, new TestProperties());
}
- public SearchBuilder(RankProfileRegistry rankProfileRegistry, QueryProfileRegistry queryProfileRegistry, ModelContext.Properties properties) {
+ public SchemaBuilder(RankProfileRegistry rankProfileRegistry, QueryProfileRegistry queryProfileRegistry, ModelContext.Properties properties) {
this(MockApplicationPackage.createEmpty(), new MockFileRegistry(), new BaseDeployLogger(), properties, rankProfileRegistry, queryProfileRegistry);
}
- public SearchBuilder(ApplicationPackage app,
+ public SchemaBuilder(ApplicationPackage app,
FileRegistry fileRegistry,
DeployLogger deployLogger,
ModelContext.Properties properties,
@@ -114,7 +114,7 @@ public class SearchBuilder {
QueryProfileRegistry queryProfileRegistry) {
this(app, fileRegistry, deployLogger, properties, rankProfileRegistry, queryProfileRegistry, false);
}
- private SearchBuilder(ApplicationPackage applicationPackage,
+ private SchemaBuilder(ApplicationPackage applicationPackage,
FileRegistry fileRegistry,
DeployLogger deployLogger,
ModelContext.Properties properties,
@@ -327,22 +327,22 @@ public class SearchBuilder {
* Convenience factory method to import and build a {@link Schema} object from a string.
*
* @param sd The string to build from.
- * @return The built {@link SearchBuilder} object.
+ * @return The built {@link SchemaBuilder} object.
* @throws ParseException Thrown if there was a problem parsing the string.
*/
- public static SearchBuilder createFromString(String sd) throws ParseException {
+ public static SchemaBuilder createFromString(String sd) throws ParseException {
return createFromString(sd, new BaseDeployLogger());
}
- public static SearchBuilder createFromString(String sd, DeployLogger logger) throws ParseException {
- SearchBuilder builder = new SearchBuilder(logger);
+ public static SchemaBuilder createFromString(String sd, DeployLogger logger) throws ParseException {
+ SchemaBuilder builder = new SchemaBuilder(logger);
builder.importString(sd);
builder.build(true);
return builder;
}
- public static SearchBuilder createFromStrings(DeployLogger logger, String ... schemas) throws ParseException {
- SearchBuilder builder = new SearchBuilder(logger);
+ public static SchemaBuilder createFromStrings(DeployLogger logger, String ... schemas) throws ParseException {
+ SchemaBuilder builder = new SchemaBuilder(logger);
for (var schema : schemas)
builder.importString(schema);
builder.build(true);
@@ -353,26 +353,26 @@ public class SearchBuilder {
* Convenience factory method to import and build a {@link Schema} object from a file. Only for testing.
*
* @param fileName the file to build from
- * @return the built {@link SearchBuilder} object
+ * @return the built {@link SchemaBuilder} object
* @throws IOException if there was a problem reading the file.
* @throws ParseException if there was a problem parsing the file content.
*/
- public static SearchBuilder createFromFile(String fileName) throws IOException, ParseException {
+ public static SchemaBuilder createFromFile(String fileName) throws IOException, ParseException {
return createFromFile(fileName, new BaseDeployLogger());
}
/**
* Convenience factory methdd to create a SearchBuilder from multiple SD files. Only for testing.
*/
- public static SearchBuilder createFromFiles(Collection<String> fileNames) throws IOException, ParseException {
+ public static SchemaBuilder createFromFiles(Collection<String> fileNames) throws IOException, ParseException {
return createFromFiles(fileNames, new BaseDeployLogger());
}
- public static SearchBuilder createFromFile(String fileName, DeployLogger logger) throws IOException, ParseException {
+ public static SchemaBuilder createFromFile(String fileName, DeployLogger logger) throws IOException, ParseException {
return createFromFile(fileName, logger, new RankProfileRegistry(), new QueryProfileRegistry());
}
- private static SearchBuilder createFromFiles(Collection<String> fileNames, DeployLogger logger) throws IOException, ParseException {
+ private static SchemaBuilder createFromFiles(Collection<String> fileNames, DeployLogger logger) throws IOException, ParseException {
return createFromFiles(fileNames, new MockFileRegistry(), logger, new TestProperties(), new RankProfileRegistry(), new QueryProfileRegistry());
}
@@ -382,14 +382,14 @@ public class SearchBuilder {
* @param fileName the file to build from.
* @param deployLogger logger for deploy messages.
* @param rankProfileRegistry registry for rank profiles.
- * @return the built {@link SearchBuilder} object.
+ * @return the built {@link SchemaBuilder} object.
* @throws IOException if there was a problem reading the file.
* @throws ParseException if there was a problem parsing the file content.
*/
- private static SearchBuilder createFromFile(String fileName,
- DeployLogger deployLogger,
- RankProfileRegistry rankProfileRegistry,
- QueryProfileRegistry queryprofileRegistry)
+ private static SchemaBuilder createFromFile(String fileName,
+ DeployLogger deployLogger,
+ RankProfileRegistry rankProfileRegistry,
+ QueryProfileRegistry queryprofileRegistry)
throws IOException, ParseException {
return createFromFiles(Collections.singletonList(fileName), new MockFileRegistry(), deployLogger, new TestProperties(),
rankProfileRegistry, queryprofileRegistry);
@@ -398,14 +398,14 @@ public class SearchBuilder {
/**
* Convenience factory methdd to create a SearchBuilder from multiple SD files..
*/
- private static SearchBuilder createFromFiles(Collection<String> fileNames,
- FileRegistry fileRegistry,
- DeployLogger deployLogger,
- ModelContext.Properties properties,
- RankProfileRegistry rankProfileRegistry,
- QueryProfileRegistry queryprofileRegistry)
+ private static SchemaBuilder createFromFiles(Collection<String> fileNames,
+ FileRegistry fileRegistry,
+ DeployLogger deployLogger,
+ ModelContext.Properties properties,
+ RankProfileRegistry rankProfileRegistry,
+ QueryProfileRegistry queryprofileRegistry)
throws IOException, ParseException {
- SearchBuilder builder = new SearchBuilder(MockApplicationPackage.createEmpty(),
+ SchemaBuilder builder = new SchemaBuilder(MockApplicationPackage.createEmpty(),
fileRegistry,
deployLogger,
properties,
@@ -419,17 +419,17 @@ public class SearchBuilder {
}
- public static SearchBuilder createFromDirectory(String dir, FileRegistry fileRegistry, DeployLogger logger, ModelContext.Properties properties) throws IOException, ParseException {
+ public static SchemaBuilder createFromDirectory(String dir, FileRegistry fileRegistry, DeployLogger logger, ModelContext.Properties properties) throws IOException, ParseException {
return createFromDirectory(dir, fileRegistry, logger, properties, new RankProfileRegistry());
}
- public static SearchBuilder createFromDirectory(String dir,
+ public static SchemaBuilder createFromDirectory(String dir,
FileRegistry fileRegistry,
DeployLogger logger,
ModelContext.Properties properties,
RankProfileRegistry rankProfileRegistry) throws IOException, ParseException {
return createFromDirectory(dir, fileRegistry, logger, properties, rankProfileRegistry, createQueryProfileRegistryFromDirectory(dir));
}
- private static SearchBuilder createFromDirectory(String dir,
+ private static SchemaBuilder createFromDirectory(String dir,
FileRegistry fileRegistry,
DeployLogger logger,
ModelContext.Properties properties,
@@ -439,14 +439,14 @@ public class SearchBuilder {
rankProfileRegistry, queryProfileRegistry);
}
- private static SearchBuilder createFromDirectory(String dir,
+ private static SchemaBuilder createFromDirectory(String dir,
ApplicationPackage applicationPackage,
FileRegistry fileRegistry,
DeployLogger deployLogger,
ModelContext.Properties properties,
RankProfileRegistry rankProfileRegistry,
QueryProfileRegistry queryProfileRegistry) throws IOException, ParseException {
- SearchBuilder builder = new SearchBuilder(applicationPackage,
+ SchemaBuilder builder = new SchemaBuilder(applicationPackage,
fileRegistry,
deployLogger,
properties,
@@ -517,13 +517,13 @@ public class SearchBuilder {
* Convenience factory method to import and build a {@link Schema} object from a raw object.
*
* @param rawSchema the raw object to build from.
- * @return the built {@link SearchBuilder} object.
+ * @return the built {@link SchemaBuilder} object.
* @see #importRawSearch(Schema)
*/
- public static SearchBuilder createFromRawSearch(Schema rawSchema,
+ public static SchemaBuilder createFromRawSearch(Schema rawSchema,
RankProfileRegistry rankProfileRegistry,
QueryProfileRegistry queryProfileRegistry) {
- SearchBuilder builder = new SearchBuilder(rankProfileRegistry, queryProfileRegistry);
+ SchemaBuilder builder = new SchemaBuilder(rankProfileRegistry, queryProfileRegistry);
builder.importRawSearch(rawSchema);
builder.build();
return builder;
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/Deriver.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/Deriver.java
index 24221d2ed75..10dca70ab6c 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/Deriver.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/Deriver.java
@@ -2,7 +2,7 @@
package com.yahoo.searchdefinition.derived;
import com.yahoo.document.DocumenttypesConfig;
import com.yahoo.document.config.DocumentmanagerConfig;
-import com.yahoo.searchdefinition.SearchBuilder;
+import com.yahoo.searchdefinition.SchemaBuilder;
import com.yahoo.searchdefinition.parser.ParseException;
import com.yahoo.vespa.configmodel.producers.DocumentManager;
import com.yahoo.vespa.configmodel.producers.DocumentTypes;
@@ -17,8 +17,8 @@ import java.util.List;
*/
public class Deriver {
- public static SearchBuilder getSearchBuilder(List<String> sds) {
- SearchBuilder builder = new SearchBuilder();
+ public static SchemaBuilder getSearchBuilder(List<String> sds) {
+ SchemaBuilder builder = new SchemaBuilder();
try {
for (String s : sds) {
builder.importFile(s);