Simplify

4 files changed, 7 insertions, 14 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 43b008ddab6..7bc71556a22 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
@@ -475,14 +475,13 @@ public class DeployState implements ConfigDefinitionStore {
                                                               QueryProfiles queryProfiles,
                                                               ValidationParameters validationParameters) {
             Collection<NamedReader> readers = applicationPackage.getSchemas();
-            Map<String, String> names = new LinkedHashMap<>();
-            SchemaBuilder builder = new SchemaBuilder(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();
                     String topLevelName = builder.importReader(reader, readerName);
                     String sdName = stripSuffix(readerName, ApplicationPackage.SD_NAME_SUFFIX);
-                    names.put(topLevelName, sdName);
                     if ( ! sdName.equals(topLevelName)) {
                         throw new IllegalArgumentException("Schema file name ('" + sdName + "') and name of " +
                                                            "top level element ('" + topLevelName +
@@ -497,7 +496,7 @@ public class DeployState implements ConfigDefinitionStore {
                 }
             }
             builder.build(! validationParameters.ignoreValidationErrors());
-            return SearchDocumentModel.fromBuilderAndNames(builder, names);
+            return SearchDocumentModel.fromBuilder(builder);
         }
 
         private static String stripSuffix(String nodeName, String postfix) {
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 ece3a662d94..92950e01766 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
@@ -34,10 +34,10 @@ public class SearchDocumentModel {
         return schemas;
     }
 
-    public static SearchDocumentModel fromBuilderAndNames(SchemaBuilder builder, Map<String, String> names) {
+    public static SearchDocumentModel fromBuilder(SchemaBuilder builder) {
         List<NamedSchema> ret = new ArrayList<>();
         for (Schema schema : builder.getSchemaList()) {
-            ret.add(new NamedSchema(names.get(schema.getName()), schema));
+            ret.add(new NamedSchema(schema.getName(), schema));
         }
         return new SearchDocumentModel(builder.getModel(), ret);
     }
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 fb76c945344..ace0bdca590 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/Application.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/Application.java
@@ -26,7 +26,6 @@ public class Application {
 
     public ApplicationPackage applicationPackage() { return applicationPackage; }
 
-
     public void add(Schema schema) {
         if (schemas.containsKey(schema.getName()))
             throw new IllegalArgumentException("Duplicate schema '" + schema.getName() + "' in " + this);
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/Schema.java b/config-model/src/main/java/com/yahoo/searchdefinition/Schema.java
index dec0a061b21..6ef4084e5b7 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/Schema.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/Schema.java
@@ -124,7 +124,6 @@ public class Schema implements ImmutableSchema {
                   DeployLogger deployLogger,
                   ModelContext.Properties properties) {
         this(inherited, application, fileRegistry, deployLogger, properties, false);
-        if (1==1) throw new RuntimeException("df");
         this.name = name;
     }
 
@@ -148,14 +147,10 @@ public class Schema implements ImmutableSchema {
         onnxModels = new OnnxModels(fileRegistry, Optional.of(this));
     }
 
-    protected void setName(String name) {
-        this.name = name;
-    }
+    protected void setName(String name) { this.name = name; }
 
     @Override
-    public String getName() {
-        return name;
-    }
+    public String getName() {return name; }
 
     /** Returns true if this only defines a document type, not a full schema */
     public boolean isDocumentsOnly() {