diff options
author | Jon Bratseth <bratseth@gmail.com> | 2021-10-25 17:42:41 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2021-10-25 17:42:41 +0200 |
commit | 88b1861bbd9375a95a414f139034357e56bd9f68 (patch) | |
tree | fa1df0f46841bd0a3bd7fb15dcdb78174cac30cf | |
parent | 25a892f7b43a58f75ad6d842aad1fd62d9f1ee1c (diff) |
Simplify
-rw-r--r-- | config-model/src/main/java/com/yahoo/searchdefinition/Application.java | 7 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/searchdefinition/SchemaBuilder.java | 5 |
2 files changed, 1 insertions, 11 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/Application.java b/config-model/src/main/java/com/yahoo/searchdefinition/Application.java index 19a536a18f7..bdcb65ee938 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/Application.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/Application.java @@ -45,13 +45,6 @@ public class Application { /** Returns an unmodifiable list of the schemas of this application */ public Map<String, Schema> schemas() { return Collections.unmodifiableMap(schemas); } - /** Used by SearchBuilder, for now */ - void replaceSchemasBy(List<Schema> schemas) { - this.schemas.clear(); - for (var schema : schemas) - this.schemas.put(schema.getName(), schema); - } - /** Validates this. Must be called after all content is added to it. */ public void validate(DeployLogger logger) { schemas.values().forEach(schema -> schema.validate(logger)); diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/SchemaBuilder.java b/config-model/src/main/java/com/yahoo/searchdefinition/SchemaBuilder.java index a2c3f88bf9c..32b9155a839 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/SchemaBuilder.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/SchemaBuilder.java @@ -215,7 +215,7 @@ public class SchemaBuilder { * Processes and finalizes the imported search definitions so that they become available through the {@link * #getSearch(String)} method. * - * @throws IllegalStateException Thrown if this method has already been called. + * @throws IllegalStateException thrown if this method has already been called */ public void build(boolean validate) { if (isBuilt) throw new IllegalStateException("Model already built"); @@ -223,7 +223,6 @@ public class SchemaBuilder { if (validate) application.validate(deployLogger); - List<Schema> built = new ArrayList<>(); List<SDDocumentType> sdocs = new ArrayList<>(); sdocs.add(SDDocumentType.VESPA_DOCUMENT); for (Schema schema : application.schemas().values()) { @@ -253,14 +252,12 @@ public class SchemaBuilder { for (Schema schema : new SearchOrderer().order(schemasSomewhatOrdered)) { new FieldOperationApplierForSearch().process(schema); // TODO: Why is this not in the regular list? process(schema, new QueryProfiles(queryProfileRegistry, deployLogger), validate); - built.add(schema); } builder.addToModel(schemasSomewhatOrdered); if ( validate && ! builder.valid() ) throw new IllegalArgumentException("Impossible to build a correct model"); - application.replaceSchemasBy(built); isBuilt = true; } |