From e94d28dd48c5ac5f40885d7d64cd8480bebba3c8 Mon Sep 17 00:00:00 2001
From: Jon Bratseth <bratseth@oath.com>
Date: Wed, 31 Jan 2018 12:31:58 +0100
Subject: Nonfunctional changes only

---
 config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java | 3 ++-
 .../expressiontransforms/TensorFlowFeatureConverter.java               | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'config-model/src/main/java')

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);
         }
     }
 
-- 
cgit v1.2.3