summaryrefslogtreecommitdiffstats
path: root/config-model/src/main/java
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2018-01-31 12:31:58 +0100
committerJon Bratseth <bratseth@oath.com>2018-01-31 12:31:58 +0100
commite94d28dd48c5ac5f40885d7d64cd8480bebba3c8 (patch)
tree1e4f17f16ed69432f7c11058d19b38ce3581951c /config-model/src/main/java
parenta44edeba9f38c38c431d7b9b6e1ac454e2a0e610 (diff)
Nonfunctional changes only
Diffstat (limited to 'config-model/src/main/java')
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java3
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/TensorFlowFeatureConverter.java2
2 files changed, 3 insertions, 2 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 3b68e0199a9..cd65c6ef761 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java
@@ -708,7 +708,8 @@ public class RankProfile implements Serializable, Cloneable {
private void checkNameCollisions(Map<String, Macro> macros, Map<String, Value> constants) {
for (Map.Entry<String, Macro> macroEntry : macros.entrySet()) {
if (constants.get(macroEntry.getKey()) != null)
- throw new IllegalArgumentException("Cannot have both a constant and macro named '" + macroEntry.getKey() + "'");
+ throw new IllegalArgumentException("Cannot have both a constant and macro named '" +
+ macroEntry.getKey() + "'");
}
}
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/TensorFlowFeatureConverter.java b/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/TensorFlowFeatureConverter.java
index d0f705d4c9a..9c7fd7d9f0a 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/TensorFlowFeatureConverter.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/TensorFlowFeatureConverter.java
@@ -189,7 +189,7 @@ public class TensorFlowFeatureConverter extends ExpressionTransformer<RankProfil
throw new IllegalArgumentException("Model refers Placeholder '" + macroName +
"' of type " + requiredType +
" which must be produced by a macro in the rank profile, but " +
- "this macro produces type " + actualType + " in " + profile);
+ "this macro produces type " + actualType);
}
}