diff options
-rw-r--r-- | config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java | 7 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/searchdefinition/SchemaBuilder.java | 4 |
2 files changed, 1 insertions, 10 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java b/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java index 14404528acc..8809cdeacc8 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java @@ -45,18 +45,13 @@ import static java.util.stream.Collectors.toSet; */ public class DocumentModelBuilder { - private DocumentModel model; - private final Map<NewDocumentType, List<SDDocumentType>> scratchInheritsMap = new HashMap<>(); + private final DocumentModel model; public DocumentModelBuilder(DocumentModel model) { this.model = model; model.getDocumentManager().add(VespaDocumentType.INSTANCE); } - public boolean valid() { - return scratchInheritsMap.isEmpty(); - } - public void addToModel(Collection<Schema> schemaList) { List<SDDocumentType> docList = new LinkedList<>(); for (Schema schema : schemaList) { 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 32b9155a839..ae849b0b538 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/SchemaBuilder.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/SchemaBuilder.java @@ -254,10 +254,6 @@ public class SchemaBuilder { process(schema, new QueryProfiles(queryProfileRegistry, deployLogger), validate); } builder.addToModel(schemasSomewhatOrdered); - - if ( validate && ! builder.valid() ) - throw new IllegalArgumentException("Impossible to build a correct model"); - isBuilt = true; } |