summaryrefslogtreecommitdiffstats
path: root/config-model/src/main/java/com/yahoo
diff options
context:
space:
mode:
authorArne H Juul <arnej@yahooinc.com>2022-03-08 11:27:42 +0000
committerArne H Juul <arnej@yahooinc.com>2022-03-11 13:36:53 +0000
commitee4fb1f44497518575d0cd38afee55b4a20706cf (patch)
tree8af4f9454558b53452fd62a801e04c08581e7ecb /config-model/src/main/java/com/yahoo
parentba2758ab815ebe7ab2fa9b702b3ace7d5c0fd0d7 (diff)
even TemporarySDField should be connected to a "repo"
Diffstat (limited to 'config-model/src/main/java/com/yahoo')
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/document/TemporarySDField.java8
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertSchemaCollection.java2
2 files changed, 5 insertions, 5 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/TemporarySDField.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/TemporarySDField.java
index 4ced104fa55..6a47d08e3ac 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/document/TemporarySDField.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/TemporarySDField.java
@@ -8,12 +8,12 @@ import com.yahoo.document.DataType;
*/
public class TemporarySDField extends SDField {
- public TemporarySDField(String name, DataType dataType, SDDocumentType owner) {
- super(owner, name, dataType, owner, false);
+ public TemporarySDField(SDDocumentType repo, String name, DataType dataType, SDDocumentType owner) {
+ super(repo, name, dataType, owner, false);
}
- public TemporarySDField(String name, DataType dataType) {
- super(null, name, dataType, false);
+ public TemporarySDField(SDDocumentType repo, String name, DataType dataType) {
+ super(repo, name, dataType, false);
}
}
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertSchemaCollection.java b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertSchemaCollection.java
index 99614227714..2d9a788cfef 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertSchemaCollection.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertSchemaCollection.java
@@ -221,7 +221,7 @@ public class ConvertSchemaCollection {
}
if (parsed.getMatchSettings().isPresent()) {
// same ugliness as SDParser.jj used to have:
- var tmp = new SDField(null, setName, DataType.STRING);
+ var tmp = new SDField(setName, DataType.STRING);
ConvertParsedFields.convertMatchSettings(tmp, parsed.matchSettings());
schema.fieldSets().userFieldSets().get(setName).setMatching(tmp.getMatching());
}