Simplify AST classes used for imported fields.

1 files changed, 20 insertions, 12 deletions

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 23a5e05c55f..5c400c8d5f2 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
@@ -2,28 +2,36 @@
 package com.yahoo.searchdefinition.document;
 
 /**
- * Temporary field that is imported from a field in a referenced document type.
+ * A field that is imported from a field in a referenced document type and given an alias name.
  *
- * After all SD files are parsed this temporary field can be validated and connected
- * to the actual field instance in the referenced document type.
+ * This is temporary AST structure that only refers to the imported field by name.
  *
  * @author geirst
  */
 public class TemporaryImportedField {
 
-    private final String fieldName;
-    private final TemporaryFieldReference reference;
+    private final String aliasFieldName;
+    private final String documentReferenceFieldName;
+    private final String foreignFieldName;
 
-    public TemporaryImportedField(String fieldName, TemporaryFieldReference reference) {
-        this.fieldName = fieldName;
-        this.reference = reference;
+    public TemporaryImportedField(String aliasFieldName,
+                                  String documentReferenceFieldName,
+                                  String foreignFieldName) {
+        this.aliasFieldName = aliasFieldName;
+        this.documentReferenceFieldName = documentReferenceFieldName;
+        this.foreignFieldName = foreignFieldName;
     }
 
-    public String fieldName() {
-        return fieldName;
+    public String aliasFieldName() {
+        return aliasFieldName;
     }
 
-    public TemporaryFieldReference reference() {
-        return reference;
+    public String documentReferenceFieldName() {
+        return documentReferenceFieldName;
     }
+
+    public String foreignFieldName() {
+        return foreignFieldName;
+    }
+
 }