Simplify

2 files changed, 4 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 92c0621570b..d83419f5093 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
@@ -476,7 +476,7 @@ public class DeployState implements ConfigDefinitionStore {
                                                       rankProfileRegistry, queryProfiles.getRegistry());
             builder.importFromApplicationPackage();
             builder.build(! validationParameters.ignoreValidationErrors());
-            return SearchDocumentModel.fromBuilder(builder);
+            return new SearchDocumentModel(builder);
         }
 
     }
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 2e4a41b70d5..3673451b9ba 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
@@ -19,9 +19,9 @@ public class SearchDocumentModel {
     private final DocumentModel documentModel;
     private final List<Schema> schemas;
 
-    public SearchDocumentModel(DocumentModel documentModel, List<Schema> schemas) {
-        this.documentModel = documentModel;
-        this.schemas = schemas;
+    public SearchDocumentModel(SchemaBuilder builder) {
+        this.documentModel = builder.getModel();
+        this.schemas = builder.getSchemaList();
     }
 
     public DocumentModel getDocumentModel() {
@@ -32,12 +32,4 @@ public class SearchDocumentModel {
         return schemas;
     }
 
-    public static SearchDocumentModel fromBuilder(SchemaBuilder builder) {
-        List<Schema> ret = new ArrayList<>();
-        for (Schema schema : builder.getSchemaList()) {
-            ret.add(schema);
-        }
-        return new SearchDocumentModel(builder.getModel(), ret);
-    }
-
 }