From 9b8fd57bba00ded1abad67b7eb58ab6116bee0a0 Mon Sep 17 00:00:00 2001
From: Jon Bratseth <bratseth@gmail.com>
Date: Mon, 24 Jan 2022 16:33:29 +0100
Subject: Simplify

---
 .../com/yahoo/config/model/deploy/DeployState.java    |  2 +-
 .../vespa/model/content/ContentSearchCluster.java     |  2 +-
 .../com/yahoo/vespa/model/search/NamedSchema.java     | 10 ----------
 .../model/search/SchemaDefinitionXMLHandler.java      | 19 ++++++++++++-------
 4 files changed, 14 insertions(+), 19 deletions(-)

(limited to 'config-model')

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 3175252011c..74a0a7cba57 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
@@ -217,7 +217,7 @@ public class DeployState implements ConfigDefinitionStore {
         ImportedMlModels importedModels = new ImportedMlModels(importFrom, executor, modelImporters);
         for (var entry : importedModels.getSkippedModels().entrySet()) {
             deployLogger.logApplicationPackage(Level.WARNING, "Skipping import of model " + entry.getKey() + " as an exception " +
-                    "occurred during import. Error: " + entry.getValue());
+                                                              "occurred during import. Error: " + entry.getValue());
         }
         return importedModels;
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java
index 602b3c0ed3a..a37918f516e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java
@@ -250,7 +250,7 @@ public class ContentSearchCluster extends AbstractConfigProducer<SearchCluster>
         for (ModelElement e : searchDefs) {
             SchemaDefinitionXMLHandler schemaDefinitionXMLHandler = new SchemaDefinitionXMLHandler(e);
             NamedSchema searchDefinition =
-                    schemaDefinitionXMLHandler.getResponsibleSearchDefinition(deployState.getSchemas());
+                    schemaDefinitionXMLHandler.findResponsibleSchema(deployState.getSchemas());
             if (searchDefinition == null)
                 throw new IllegalArgumentException("Schema '" + schemaDefinitionXMLHandler.getName() + "' referenced in " +
                                                    this + " does not exist");
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/NamedSchema.java b/config-model/src/main/java/com/yahoo/vespa/model/search/NamedSchema.java
index 334493b4a92..17261a39566 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/NamedSchema.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/NamedSchema.java
@@ -29,16 +29,6 @@ public class NamedSchema {
         this.schema = schema;
     }
 
-    //Find search definition from a collection with the name specified
-    public static NamedSchema findByName(String schemaName, Collection<NamedSchema> schemas) {
-        for (NamedSchema candidate : schemas) {
-            if (candidate.getName().equals(schemaName) )
-                return candidate;
-        }
-
-        return null;
-    }
-
     // Used by admin interface
     public String getFilename() {
         return getName() + fileNameSuffix;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/SchemaDefinitionXMLHandler.java b/config-model/src/main/java/com/yahoo/vespa/model/search/SchemaDefinitionXMLHandler.java
index 881b68e8396..8f5d92ce4bd 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/SchemaDefinitionXMLHandler.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/SchemaDefinitionXMLHandler.java
@@ -4,6 +4,7 @@ package com.yahoo.vespa.model.search;
 import com.yahoo.vespa.model.builder.xml.dom.ModelElement;
 
 import java.io.Serializable;
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -13,19 +14,23 @@ import java.util.List;
  */
 public class SchemaDefinitionXMLHandler implements Serializable {
 
-    private String sdName;
+    private String schemaName;
 
     public SchemaDefinitionXMLHandler(ModelElement elem) {
-        sdName = elem.stringAttribute("name");
-        if (sdName == null) {
-            sdName = elem.stringAttribute("type");
+        schemaName = elem.stringAttribute("name");
+        if (schemaName == null) {
+            schemaName = elem.stringAttribute("type");
         }
     }
 
-    public String getName() { return sdName; }
+    public String getName() { return schemaName; }
 
-    public NamedSchema getResponsibleSearchDefinition(List<NamedSchema> schemas) {
-        return NamedSchema.findByName(getName(), schemas );
+    public NamedSchema findResponsibleSchema(List<NamedSchema> schemas) {
+        for (NamedSchema candidate : schemas) {
+            if (candidate.getName().equals(schemaName) )
+                return candidate;
+        }
+        return null;
     }
 
 }
-- 
cgit v1.2.3