Simplify

2 files changed, 8 insertions, 12 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 74a0a7cba57..92c0621570b 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,6 +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.Schema;
 import com.yahoo.searchdefinition.SchemaBuilder;
 import com.yahoo.searchdefinition.parser.ParseException;
 import com.yahoo.vespa.config.ConfigDefinition;
@@ -40,7 +41,6 @@ import com.yahoo.vespa.model.container.search.QueryProfiles;
 import com.yahoo.vespa.model.container.search.QueryProfilesBuilder;
 import com.yahoo.vespa.model.container.search.SemanticRuleBuilder;
 import com.yahoo.vespa.model.container.search.SemanticRules;
-import com.yahoo.vespa.model.search.NamedSchema;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -69,7 +69,7 @@ public class DeployState implements ConfigDefinitionStore {
     private final DeployLogger logger;
     private final FileRegistry fileRegistry;
     private final DocumentModel documentModel;
-    private final List<NamedSchema> schemas;
+    private final List<Schema> schemas;
     private final ApplicationPackage applicationPackage;
     private final Optional<ConfigDefinitionRepo> configDefinitionRepo;
     private final Optional<ApplicationPackage> permanentApplicationPackage;
@@ -236,9 +236,7 @@ public class DeployState implements ConfigDefinitionStore {
         return applicationPackage;
     }
 
-    public List<NamedSchema> getSchemas() {
-        return schemas;
-    }
+    public List<Schema> getSchemas() { return schemas; }
 
     public DocumentModel getDocumentModel() {
         return documentModel;
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 92950e01766..2e4a41b70d5 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
@@ -4,11 +4,9 @@ package com.yahoo.config.model.deploy;
 import com.yahoo.searchdefinition.Schema;
 import com.yahoo.searchdefinition.SchemaBuilder;
 import com.yahoo.vespa.documentmodel.DocumentModel;
-import com.yahoo.vespa.model.search.NamedSchema;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Internal helper class to retrieve document model and schemas.
@@ -19,9 +17,9 @@ import java.util.Map;
 public class SearchDocumentModel {
 
     private final DocumentModel documentModel;
-    private final List<NamedSchema> schemas;
+    private final List<Schema> schemas;
 
-    public SearchDocumentModel(DocumentModel documentModel, List<NamedSchema> schemas) {
+    public SearchDocumentModel(DocumentModel documentModel, List<Schema> schemas) {
         this.documentModel = documentModel;
         this.schemas = schemas;
     }
@@ -30,14 +28,14 @@ public class SearchDocumentModel {
         return documentModel;
     }
 
-    public List<NamedSchema> getSchemas() {
+    public List<Schema> getSchemas() {
         return schemas;
     }
 
     public static SearchDocumentModel fromBuilder(SchemaBuilder builder) {
-        List<NamedSchema> ret = new ArrayList<>();
+        List<Schema> ret = new ArrayList<>();
         for (Schema schema : builder.getSchemaList()) {
-            ret.add(new NamedSchema(schema.getName(), schema));
+            ret.add(schema);
         }
         return new SearchDocumentModel(builder.getModel(), ret);
     }