Align naming of imported fields across Java code and config.

9 files changed, 67 insertions, 72 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentGraphValidator.java b/config-model/src/main/java/com/yahoo/searchdefinition/DocumentGraphValidator.java
index c941b867120..71b9fb30648 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentGraphValidator.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/DocumentGraphValidator.java
@@ -33,7 +33,7 @@ public class DocumentGraphValidator {
                     .forEach(entry -> {
                         DocumentReference documentReference = entry.getValue();
                         if (!isSelfReference(documentReference, currentDocument)) {
-                            SDDocumentType referencedDocument = entry.getValue().search().getDocument();
+                            SDDocumentType referencedDocument = entry.getValue().targetSearch().getDocument();
                             validateDocument(root, referencedDocument);
                         }
                     });
@@ -60,7 +60,7 @@ public class DocumentGraphValidator {
     }
 
     private static boolean isSelfReference(DocumentReference documentReference, SDDocumentType document) {
-        return documentReference.search().getDocument().equals(document);
+        return documentReference.targetSearch().getDocument().equals(document);
     }
 
     public static class DocumentGraphException extends IllegalArgumentException {
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java b/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java
index 661447cc777..e513436ca66 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java
@@ -393,7 +393,7 @@ public class DocumentModelBuilder {
             return emptySet();
         }
         return documentReferences.get().referenceMap().values().stream()
-                .map(documentReference -> documentReference.search().getDocument())
+                .map(documentReference -> documentReference.targetSearch().getDocument())
                 .map(documentType -> new NewDocumentType.Name(documentType.getName()))
                 .collect(toSet());
     }
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentReference.java b/config-model/src/main/java/com/yahoo/searchdefinition/DocumentReference.java
index e877c472472..eda29158fd3 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentReference.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/DocumentReference.java
@@ -10,19 +10,19 @@ import com.yahoo.document.Field;
  */
 public class DocumentReference {
 
-    private final Field documentReferenceField;
-    private final Search search;
+    private final Field referenceField;
+    private final Search targetSearch;
 
-    public DocumentReference(Field documentReferenceField, Search search) {
-        this.documentReferenceField = documentReferenceField;
-        this.search = search;
+    public DocumentReference(Field referenceField, Search targetSearch) {
+        this.referenceField = referenceField;
+        this.targetSearch = targetSearch;
     }
 
-    public Field documentReferenceField() {
-        return documentReferenceField;
+    public Field referenceField() {
+        return referenceField;
     }
 
-    public Search search() {
-        return search;
+    public Search targetSearch() {
+        return targetSearch;
     }
 }
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/ImportedFields.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/ImportedFields.java
index 26d71339d34..135eeebde6c 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/ImportedFields.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/ImportedFields.java
@@ -38,22 +38,17 @@ public class ImportedFields extends Derived implements ImportedFieldsConfig.Prod
     }
 
     private static void considerField(ImportedFieldsConfig.Builder builder, ImportedField field) {
-        if (field.referencedField().doesAttributing()) {
-            builder.attribute.add(buildAttribute(field));
+        if (field.targetField().doesAttributing()) {
+            builder.attribute.add(createAttributeBuilder(field));
         }
     }
 
-    private static ImportedFieldsConfig.Attribute.Builder buildAttribute(ImportedField field) {
+    private static ImportedFieldsConfig.Attribute.Builder createAttributeBuilder(ImportedField field) {
         ImportedFieldsConfig.Attribute.Builder result = new ImportedFieldsConfig.Attribute.Builder();
-        result.name(field.aliasFieldName());
-        result.reference(buildReference(field));
+        result.name(field.fieldName());
+        result.referencefield(field.reference().referenceField().getName());
+        result.targetfield(field.targetField().getName());
         return result;
     }
 
-    private static ImportedFieldsConfig.Attribute.Reference.Builder buildReference(ImportedField field) {
-        ImportedFieldsConfig.Attribute.Reference.Builder result = new ImportedFieldsConfig.Attribute.Reference.Builder();
-        result.field(field.documentReference().documentReferenceField().getName());
-        result.targetfield(field.referencedField().getName());
-        return result;
-    }
 }
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SearchOrderer.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SearchOrderer.java
index f84eef10af9..4f6b70d2d4d 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SearchOrderer.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SearchOrderer.java
@@ -107,7 +107,7 @@ public class SearchOrderer {
                 .orElseThrow(() -> new IllegalStateException("Missing document references. Should have been processed by now."));
         return documentReferences.stream()
                 .map(Map.Entry::getValue)
-                .map(DocumentReference::search)
+                .map(DocumentReference::targetSearch)
                 .allMatch(alreadyOrdered::contains);
     }
 
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/ImportedField.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/ImportedField.java
index 754a7ff7a51..e35e3fd27b6 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/document/ImportedField.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/ImportedField.java
@@ -10,28 +10,28 @@ import com.yahoo.searchdefinition.DocumentReference;
  */
 public class ImportedField {
 
-    private final String aliasFieldName;
-    private final DocumentReference documentReference;
-    private final SDField referencedField;
-
-    public ImportedField(String aliasFieldName,
-                         DocumentReference documentReference,
-                         SDField referencedField) {
-        this.aliasFieldName = aliasFieldName;
-        this.documentReference = documentReference;
-        this.referencedField = referencedField;
+    private final String fieldName;
+    private final DocumentReference reference;
+    private final SDField targetField;
+
+    public ImportedField(String fieldName,
+                         DocumentReference reference,
+                         SDField targetField) {
+        this.fieldName = fieldName;
+        this.reference = reference;
+        this.targetField = targetField;
     }
 
-    public String aliasFieldName() {
-        return aliasFieldName;
+    public String fieldName() {
+        return fieldName;
     }
 
-    public DocumentReference documentReference() {
-        return documentReference;
+    public DocumentReference reference() {
+        return reference;
     }
 
-    public SDField referencedField() {
-        return referencedField;
+    public SDField targetField() {
+        return targetField;
     }
 
 }
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/TemporaryImportedField.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/TemporaryImportedField.java
index 5c400c8d5f2..a446a8ee9ba 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/document/TemporaryImportedField.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/TemporaryImportedField.java
@@ -10,28 +10,28 @@ package com.yahoo.searchdefinition.document;
  */
 public class TemporaryImportedField {
 
-    private final String aliasFieldName;
-    private final String documentReferenceFieldName;
-    private final String foreignFieldName;
+    private final String fieldName;
+    private final String referenceFieldName;
+    private final String targetFieldName;
 
-    public TemporaryImportedField(String aliasFieldName,
-                                  String documentReferenceFieldName,
-                                  String foreignFieldName) {
-        this.aliasFieldName = aliasFieldName;
-        this.documentReferenceFieldName = documentReferenceFieldName;
-        this.foreignFieldName = foreignFieldName;
+    public TemporaryImportedField(String fieldName,
+                                  String referenceFieldName,
+                                  String targetFieldName) {
+        this.fieldName = fieldName;
+        this.referenceFieldName = referenceFieldName;
+        this.targetFieldName = targetFieldName;
     }
 
-    public String aliasFieldName() {
-        return aliasFieldName;
+    public String fieldName() {
+        return fieldName;
     }
 
-    public String documentReferenceFieldName() {
-        return documentReferenceFieldName;
+    public String referenceFieldName() {
+        return referenceFieldName;
     }
 
-    public String foreignFieldName() {
-        return foreignFieldName;
+    public String targetFieldName() {
+        return targetFieldName;
     }
 
 }
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/TemporaryImportedFields.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/TemporaryImportedFields.java
index e791e27e534..c96bdab6957 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/document/TemporaryImportedFields.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/TemporaryImportedFields.java
@@ -17,7 +17,7 @@ public class TemporaryImportedFields {
     private final Map<String, TemporaryImportedField> fields = new LinkedHashMap<>();
 
     public void add(TemporaryImportedField importedField) {
-        fields.put(importedField.aliasFieldName(), importedField);
+        fields.put(importedField.fieldName(), importedField);
     }
 
     public Map<String, TemporaryImportedField> fields() {
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ImportedFieldsResolver.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ImportedFieldsResolver.java
index 8516913d415..bc8d1eccbbc 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ImportedFieldsResolver.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ImportedFieldsResolver.java
@@ -39,36 +39,36 @@ public class ImportedFieldsResolver extends Processor {
 
     private void resolveImportedField(TemporaryImportedField importedField) {
         DocumentReference reference = validateDocumentReference(importedField);
-        SDField referencedField = validateReferencedField(importedField, reference);
-        importedFields.put(importedField.aliasFieldName(), new ImportedField(importedField.aliasFieldName(), reference, referencedField));
+        SDField targetField = validateTargetField(importedField, reference);
+        importedFields.put(importedField.fieldName(), new ImportedField(importedField.fieldName(), reference, targetField));
     }
 
     private DocumentReference validateDocumentReference(TemporaryImportedField importedField) {
-        String documentReferenceFieldName = importedField.documentReferenceFieldName();
-        DocumentReference reference = references.get().referenceMap().get(documentReferenceFieldName);
+        String referenceFieldName = importedField.referenceFieldName();
+        DocumentReference reference = references.get().referenceMap().get(referenceFieldName);
         if (reference == null) {
-            fail(importedField, "Document reference field '" + documentReferenceFieldName + "' not found");
+            fail(importedField, "Reference field '" + referenceFieldName + "' not found");
         }
         return reference;
     }
 
-    private SDField validateReferencedField(TemporaryImportedField importedField, DocumentReference reference) {
-        String foreignFieldName = importedField.foreignFieldName();
-        SDField referencedField = reference.search().getField(foreignFieldName);
-        if (referencedField == null) {
-            fail(importedField, foreignFieldAsString(foreignFieldName, reference) + "Not found");
-        } else if (!referencedField.doesAttributing()) {
-            fail(importedField, foreignFieldAsString(foreignFieldName, reference) + "Is not an attribute");
+    private SDField validateTargetField(TemporaryImportedField importedField, DocumentReference reference) {
+        String targetFieldName = importedField.targetFieldName();
+        SDField targetField = reference.targetSearch().getField(targetFieldName);
+        if (targetField == null) {
+            fail(importedField, targetFieldAsString(targetFieldName, reference) + ": Not found");
+        } else if (!targetField.doesAttributing()) {
+            fail(importedField, targetFieldAsString(targetFieldName, reference) + ": Is not an attribute");
         }
-        return referencedField;
+        return targetField;
     }
 
-    private String foreignFieldAsString(String foreignFieldName, DocumentReference reference) {
-        return "Field '" + foreignFieldName + "' via document reference field '" + reference.documentReferenceField().getName() + "': ";
+    private String targetFieldAsString(String targetFieldName, DocumentReference reference) {
+        return "Field '" + targetFieldName + "' via reference field '" + reference.referenceField().getName() + "'";
     }
 
     private void fail(TemporaryImportedField importedField, String msg) {
-        throw new IllegalArgumentException("For search '" + search.getName() + "', import field '" + importedField.aliasFieldName() + "': " + msg);
+        throw new IllegalArgumentException("For search '" + search.getName() + "', import field '" + importedField.fieldName() + "': " + msg);
     }
 
 }