Improve name of methods exposing fields in Search

Introduce new concept called 'concrete' fields which consists of all
document and extra fields. Change concept of 'all' fields to also
include 'imported' fields in addition to 'concrete' fields.

9 files changed, 44 insertions, 48 deletions

diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/CommentTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/CommentTestCase.java
index 64f96930859..b9bf7cf1678 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/CommentTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/CommentTestCase.java
@@ -18,7 +18,7 @@ public class CommentTestCase extends SearchDefinitionTestCase {
     @Test
     public void testComments() throws IOException, ParseException {
         Search search = SearchBuilder.buildFromFile("src/test/examples/comment.sd");
-        SDField field = search.getField("a");
+        SDField field = search.getConcreteField("a");
         assertEquals("{ input a | tokenize normalize stem:\"SHORTEST\" | summary a | index a; }",
                      field.getIndexingScript().toString());
     }
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/PredicateDataTypeTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/PredicateDataTypeTestCase.java
index 09b6a8e7b8b..d7b85abad1b 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/PredicateDataTypeTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/PredicateDataTypeTestCase.java
@@ -66,7 +66,7 @@ public class PredicateDataTypeTestCase {
                                             upperBoundParameter(upperBound))));
 
         SearchBuilder sb = SearchBuilder.createFromString(sd);
-        for (SDField field : sb.getSearch().allFieldsList()) {
+        for (SDField field : sb.getSearch().allConcreteFields()) {
               if (field.getDataType() == DataType.PREDICATE) {
                 for (Index index : field.getIndices().values()) {
                     assertEquals(true, index.getBooleanIndexDefiniton().hasArity());
@@ -93,7 +93,7 @@ public class PredicateDataTypeTestCase {
                                             upperBoundParameter(upperBound))));
 
         SearchBuilder sb = SearchBuilder.createFromString(sd);
-        for (SDField field : sb.getSearch().allFieldsList()) {
+        for (SDField field : sb.getSearch().allConcreteFields()) {
               if (field.getDataType() == DataType.PREDICATE) {
                 for (Index index : field.getIndices().values()) {
                     assertEquals(arity, index.getBooleanIndexDefiniton().getArity());
@@ -111,7 +111,7 @@ public class PredicateDataTypeTestCase {
                             attributeFieldSd(
                                     arityParameter(2))));
         SearchBuilder sb = SearchBuilder.createFromString(sd);
-        for (SDField field : sb.getSearch().allFieldsList()) {
+        for (SDField field : sb.getSearch().allConcreteFields()) {
             if (field.getDataType() == DataType.PREDICATE) {
                 for (Index index : field.getIndices().values()) {
                     assertEquals(true, index.getBooleanIndexDefiniton().hasArity());
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/SearchImporterTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/SearchImporterTestCase.java
index bb9680665c8..d6a8999b774 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/SearchImporterTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/SearchImporterTestCase.java
@@ -95,24 +95,24 @@ public class SearchImporterTestCase extends SearchDefinitionTestCase {
         assertEquals(1, field.getAttributes().size());
 
         // Seventh field
-        field= search.getField("categories");
+        field= search.getConcreteField("categories");
         assertEquals("{ input categories_src | lowercase | normalize | index; }",
                      field.getIndexingScript().toString());
         assertTrue(!field.isHeader());
 
         // Eight field
-        field= search.getField("categoriesagain");
+        field= search.getConcreteField("categoriesagain");
         assertEquals("{ input categoriesagain_src | lowercase | normalize | index; }",
                      field.getIndexingScript().toString());
         assertTrue(field.isHeader());
 
         // Ninth field
-        field= search.getField("exactemento");
+        field= search.getConcreteField("exactemento");
         assertEquals("{ input exactemento_src | lowercase | index | summary; }",
                      field.getIndexingScript().toString());
 
         // Tenth field
-        field = search.getField("category_arr");
+        field = search.getConcreteField("category_arr");
         assertEquals(1, field.getAttributes().size());
         attribute = field.getAttributes().get("category_arr");
         assertNotNull(attribute);
@@ -122,7 +122,7 @@ public class SearchImporterTestCase extends SearchDefinitionTestCase {
         assertTrue(field.isHeader());
 
         // Eleventh field
-        field = search.getField("measurement_arr");
+        field = search.getConcreteField("measurement_arr");
         assertEquals(1, field.getAttributes().size());
         attribute = field.getAttributes().get("measurement_arr");
         assertEquals("measurement_arr", attribute.getName());
@@ -148,7 +148,7 @@ public class SearchImporterTestCase extends SearchDefinitionTestCase {
         assertEquals("experimental",profile.getInheritedName());
 
         // The extra-document field
-        SDField exact=search.getField("exact");
+        SDField exact=search.getConcreteField("exact");
         assertNotNull("Extra field was parsed",exact);
         assertEquals("exact",exact.getName());
         assertEquals(Stemming.NONE,exact.getStemming());
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/StemmingSettingTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/StemmingSettingTestCase.java
index 6a0dd6e2c1b..0192ca06a7b 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/StemmingSettingTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/StemmingSettingTestCase.java
@@ -1,16 +1,12 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.searchdefinition;
 
-import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.searchdefinition.document.SDField;
 import com.yahoo.searchdefinition.document.Stemming;
 import com.yahoo.searchdefinition.parser.ParseException;
 import org.junit.Test;
 
 import java.io.IOException;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.logging.Level;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -48,8 +44,8 @@ public class StemmingSettingTestCase extends SearchDefinitionTestCase {
     @Test
     public void requireThatStemmingIsDefaultShortest() throws IOException, ParseException {
         Search search = SearchBuilder.buildFromFile("src/test/examples/stemmingdefault.sd");
-        assertNull(search.getField("my_str").getStemming());
-        assertEquals(Stemming.SHORTEST, search.getField("my_str").getStemming(search));
+        assertNull(search.getConcreteField("my_str").getStemming());
+        assertEquals(Stemming.SHORTEST, search.getConcreteField("my_str").getStemming(search));
     }
 
 }
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/AttributeIndexTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/AttributeIndexTestCase.java
index 9c6ff281c7a..58d9edbd6c8 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/AttributeIndexTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/AttributeIndexTestCase.java
@@ -21,14 +21,14 @@ public class AttributeIndexTestCase extends SearchDefinitionTestCase {
     public void testAttributeIndex() throws IOException, ParseException {
         Search search = UnprocessingSearchBuilder.buildUnprocessedFromFile("src/test/examples/attributeindex.sd");
 
-        assertTrue(search.getField("nosettings").getAttributes().get("nosettings") != null);
+        assertTrue(search.getConcreteField("nosettings").getAttributes().get("nosettings") != null);
 
-        assertTrue(search.getField("specifyname").getAttributes().get("newname") != null);
+        assertTrue(search.getConcreteField("specifyname").getAttributes().get("newname") != null);
 
-        assertTrue(search.getField("specifyname2").getAttributes().get("newname2") != null);
+        assertTrue(search.getConcreteField("specifyname2").getAttributes().get("newname2") != null);
 
-        assertTrue(search.getField("withstaticrankname").getAttributes().get("withstaticrankname") != null);
+        assertTrue(search.getConcreteField("withstaticrankname").getAttributes().get("withstaticrankname") != null);
 
-        assertTrue(search.getField("withstaticrankname").getAttributes().get("someothername") != null);
+        assertTrue(search.getConcreteField("withstaticrankname").getAttributes().get("someothername") != null);
     }
 }
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/AttributesExactMatchTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/AttributesExactMatchTestCase.java
index 2081ac6accc..fd06e33a86e 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/AttributesExactMatchTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/AttributesExactMatchTestCase.java
@@ -21,19 +21,19 @@ public class AttributesExactMatchTestCase extends SearchDefinitionTestCase {
     @Test
     public void testAttributesExactMatch() throws IOException, ParseException {
         Search search = SearchBuilder.buildFromFile("src/test/examples/attributesexactmatch.sd");
-        assertEquals(search.getField("color").getMatching().getType(), Matching.Type.EXACT);
-        assertEquals(search.getField("artist").getMatching().getType(), Matching.Type.WORD);
-        assertEquals(search.getField("drummer").getMatching().getType(), Matching.Type.WORD);
-        assertEquals(search.getField("guitarist").getMatching().getType(), Matching.Type.TEXT);
-        assertEquals(search.getField("saxophonist_arr").getMatching().getType(), Matching.Type.WORD);
-        assertEquals(search.getField("flutist").getMatching().getType(), Matching.Type.TEXT);
+        assertEquals(search.getConcreteField("color").getMatching().getType(), Matching.Type.EXACT);
+        assertEquals(search.getConcreteField("artist").getMatching().getType(), Matching.Type.WORD);
+        assertEquals(search.getConcreteField("drummer").getMatching().getType(), Matching.Type.WORD);
+        assertEquals(search.getConcreteField("guitarist").getMatching().getType(), Matching.Type.TEXT);
+        assertEquals(search.getConcreteField("saxophonist_arr").getMatching().getType(), Matching.Type.WORD);
+        assertEquals(search.getConcreteField("flutist").getMatching().getType(), Matching.Type.TEXT);
 
-        assertFalse(search.getField("genre").getMatching().getType().equals(Matching.Type.EXACT));
-        assertFalse(search.getField("title").getMatching().getType().equals(Matching.Type.EXACT));
-        assertFalse(search.getField("trumpetist").getMatching().getType().equals(Matching.Type.EXACT));
-        assertFalse(search.getField("genre").getMatching().getType().equals(Matching.Type.WORD));
-        assertFalse(search.getField("title").getMatching().getType().equals(Matching.Type.WORD));
-        assertFalse(search.getField("trumpetist").getMatching().getType().equals(Matching.Type.WORD));
+        assertFalse(search.getConcreteField("genre").getMatching().getType().equals(Matching.Type.EXACT));
+        assertFalse(search.getConcreteField("title").getMatching().getType().equals(Matching.Type.EXACT));
+        assertFalse(search.getConcreteField("trumpetist").getMatching().getType().equals(Matching.Type.EXACT));
+        assertFalse(search.getConcreteField("genre").getMatching().getType().equals(Matching.Type.WORD));
+        assertFalse(search.getConcreteField("title").getMatching().getType().equals(Matching.Type.WORD));
+        assertFalse(search.getConcreteField("trumpetist").getMatching().getType().equals(Matching.Type.WORD));
 
     }
 
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsResolverTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsResolverTestCase.java
index c9dd1c14a26..6152df6c0e3 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsResolverTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsResolverTestCase.java
@@ -45,9 +45,9 @@ public class ImportedFieldsResolverTestCase {
         ImportedField myField = model.importedFields.fields().get("my_attribute_field");
         assertNotNull(myField);
         assertEquals("my_attribute_field", myField.fieldName());
-        assertSame(model.childSearch.getField("ref"), myField.reference().referenceField());
+        assertSame(model.childSearch.getConcreteField("ref"), myField.reference().referenceField());
         assertSame(model.parentSearch, myField.reference().targetSearch());
-        assertSame(model.parentSearch.getField("attribute_field"), myField.targetField());
+        assertSame(model.parentSearch.getConcreteField("attribute_field"), myField.targetField());
     }
 
     @Test
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/IntegerIndex2AttributeTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/IntegerIndex2AttributeTestCase.java
index 36a325b42eb..74ed04cda2a 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/IntegerIndex2AttributeTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/IntegerIndex2AttributeTestCase.java
@@ -26,32 +26,32 @@ public class IntegerIndex2AttributeTestCase extends SearchDefinitionTestCase {
         new IntegerIndex2Attribute(search, new BaseDeployLogger(), new RankProfileRegistry(), new QueryProfiles()).process();
 
         SDField f;
-        f = search.getField("s1");
+        f = search.getConcreteField("s1");
         assertTrue(f.getAttributes().isEmpty());
         assertTrue(f.existsIndex("s1"));
-        f = search.getField("s2");
+        f = search.getConcreteField("s2");
         assertEquals(f.getAttributes().size(), 1);
         assertTrue(f.existsIndex("s2"));
 
-        f = search.getField("as1");
+        f = search.getConcreteField("as1");
         assertTrue(f.getAttributes().isEmpty());
         assertTrue(f.existsIndex("as1"));
-        f = search.getField("as2");
+        f = search.getConcreteField("as2");
         assertEquals(f.getAttributes().size(), 1);
         assertTrue(f.existsIndex("as2"));
 
-        f = search.getField("i1");
+        f = search.getConcreteField("i1");
         assertEquals(f.getAttributes().size(), 1);
         assertTrue( ! f.existsIndex("i1"));
 
-        f = search.getField("i2");
+        f = search.getConcreteField("i2");
         assertEquals(f.getAttributes().size(), 1);
         assertTrue( ! f.existsIndex("i2"));
 
-        f = search.getField("ai1");
-        assertEquals(search.getField("ai1").getAttributes().size(), 1);
-        assertTrue( ! search.getField("ai1").existsIndex("ai1"));
-        f = search.getField("ai2");
+        f = search.getConcreteField("ai1");
+        assertEquals(search.getConcreteField("ai1").getAttributes().size(), 1);
+        assertTrue( ! search.getConcreteField("ai1").existsIndex("ai1"));
+        f = search.getConcreteField("ai2");
         assertEquals(f.getAttributes().size(), 1);
         assertTrue( ! f.existsIndex("ai2"));
     }
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/NGramTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/NGramTestCase.java
index f6d40644145..20acf624aad 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/NGramTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/NGramTestCase.java
@@ -24,15 +24,15 @@ public class NGramTestCase extends SearchDefinitionTestCase {
         Search search = SearchBuilder.buildFromFile("src/test/examples/ngram.sd");
         assertNotNull(search);
 
-        SDField gram1=search.getField("gram_1");
+        SDField gram1=search.getConcreteField("gram_1");
         assertEquals(Matching.Type.GRAM,gram1.getMatching().getType());
         assertEquals(1,gram1.getMatching().getGramSize());
 
-        SDField gram2=search.getField("gram_2");
+        SDField gram2=search.getConcreteField("gram_2");
         assertEquals(Matching.Type.GRAM,gram2.getMatching().getType());
         assertEquals(-1,gram2.getMatching().getGramSize()); // Not set explicitly
 
-        SDField gram3=search.getField("gram_3");
+        SDField gram3=search.getConcreteField("gram_3");
         assertEquals(Matching.Type.GRAM,gram3.getMatching().getType());
         assertEquals(3,gram3.getMatching().getGramSize());