aboutsummaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2018-02-01 11:22:56 +0100
committerJon Bratseth <bratseth@oath.com>2018-02-01 11:22:56 +0100
commitd3d4a9f85f0fc6db3f0de2053029e00f49ea0fe9 (patch)
tree530f649db212e7a1a50d14c8c0fb868b77bdad1a /config-model
parentadd7f241c1f8e3b2af99d5453c26d99e4179aa74 (diff)
Tensor type is always present
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/RankProfileTypeSettingsProcessor.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java b/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java
index 3268522517d..b185680d41c 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java
@@ -761,7 +761,7 @@ public class RankProfile implements Serializable, Cloneable {
for (FieldDescription field : queryProfileType.declaredFields().values()) {
TensorType type = TensorType.empty; // assume the empty (aka double) type by default
if (field.getType() instanceof TensorFieldType)
- type = ((TensorFieldType)field.getType()).type().get();
+ type = ((TensorFieldType)field.getType()).type();
String feature = FeatureNames.asQueryFeature(prefix.append(field.getName()).toString());
context.setType(feature, type);
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/RankProfileTypeSettingsProcessor.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/RankProfileTypeSettingsProcessor.java
index 292f01a3308..3faebbfeae3 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/RankProfileTypeSettingsProcessor.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/RankProfileTypeSettingsProcessor.java
@@ -88,9 +88,9 @@ public class RankProfileTypeSettingsProcessor extends Processor {
if (fieldType instanceof TensorFieldType) {
TensorFieldType tensorFieldType = (TensorFieldType)fieldType;
Matcher matcher = queryFeaturePattern.matcher(fieldName);
- if (tensorFieldType.type().isPresent() && matcher.matches()) {
+ if (matcher.matches()) {
String queryFeature = matcher.group(1);
- addQueryFeatureTypeToRankProfiles(queryFeature, tensorFieldType.type().get().toString());
+ addQueryFeatureTypeToRankProfiles(queryFeature, tensorFieldType.type().toString());
}
}
}