Remove some unused code

3 files changed, 6 insertions, 27 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/SDField.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/SDField.java
index e9e168edea3..c657d29033a 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/document/SDField.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/SDField.java
@@ -29,7 +29,6 @@ import com.yahoo.vespa.indexinglanguage.parser.ParseException;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
@@ -510,14 +509,6 @@ public class SDField extends Field implements TypedKey, FieldOperationContainer,
         this.indexStructureField = indexStructureField;
     }
 
-    /**
-     * Returns an iterator of the index names this should index to
-     * (whether set explicitly or not)
-     */
-    public Iterator<String> getFieldNameAsIterator() { // TODO: Replace usage by getName
-        return Collections.singletonList(getName()).iterator();
-    }
-
     @Override
     public boolean hasIndex() {
         return  (getIndexingScript() != null) && doesIndexing();
@@ -599,12 +590,7 @@ public class SDField extends Field implements TypedKey, FieldOperationContainer,
     @Override
     public boolean existsIndex(String name) {
         if (indices.get(name) != null) return true;
-        if (name.equals(getName())) {
-            if (doesIndexing()) {
-                return true;
-            }
-        }
-        return false;
+        return name.equals(getName()) && doesIndexing();
     }
 
     /**
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/MultifieldIndexHarmonizer.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/MultifieldIndexHarmonizer.java
index a52a8ab74e6..7adb7f44594 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/MultifieldIndexHarmonizer.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/MultifieldIndexHarmonizer.java
@@ -10,7 +10,6 @@ import com.yahoo.searchdefinition.processing.multifieldresolver.RankTypeResolver
 import com.yahoo.searchdefinition.processing.multifieldresolver.StemmingResolver;
 import com.yahoo.vespa.model.container.search.QueryProfiles;
 
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -39,11 +38,7 @@ public class MultifieldIndexHarmonizer extends Processor {
     private void populateIndexToFields(Search search) {
         for (SDField field : search.allConcreteFields() ) {
             if ( ! field.doesIndexing()) continue;
-
-            for (Iterator j = field.getFieldNameAsIterator(); j.hasNext();) {
-                String indexName = (String)j.next();
-                addIndexField(indexName, field);
-            }
+            addIndexField(field.getName(), field);
         }
     }
 
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/Processor.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/Processor.java
index c070a1a2126..e15e17817a2 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/Processor.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/Processor.java
@@ -80,12 +80,10 @@ public abstract class Processor {
         implementationField.setStemming(Stemming.NONE);
         implementationField.getNormalizing().inferCodepoint();
         implementationField.parseIndexingScript(indexing);
-        for (Iterator i = field.getFieldNameAsIterator(); i.hasNext();) {
-            String indexName = (String)i.next();
-            String implementationIndexName = indexName + "_" + suffix;
-            Index implementationIndex = new Index(implementationIndexName);
-            search.addIndex(implementationIndex);
-        }
+        String indexName = field.getName();
+        String implementationIndexName = indexName + "_" + suffix;
+        Index implementationIndex = new Index(implementationIndexName);
+        search.addIndex(implementationIndex);
         if (queryCommand != null) {
             field.addQueryCommand(queryCommand);
         }