Merge pull request #24280 from vespa-engine/bratseth/update-terminology

Update terminology

2 files changed, 10 insertions, 9 deletions

diff --git a/config-model/src/main/java/com/yahoo/schema/processing/RankingExpressionTypeResolver.java b/config-model/src/main/java/com/yahoo/schema/processing/RankingExpressionTypeResolver.java
index d985089b2cb..e1daf7810e5 100644
--- a/config-model/src/main/java/com/yahoo/schema/processing/RankingExpressionTypeResolver.java
+++ b/config-model/src/main/java/com/yahoo/schema/processing/RankingExpressionTypeResolver.java
@@ -90,10 +90,10 @@ public class RankingExpressionTypeResolver extends Processor {
                  && ! context.queryFeaturesNotDeclared().isEmpty()
                  && ! warnedAbout.containsAll(context.queryFeaturesNotDeclared())) {
                 if (profile.isStrict())
-                    throw new IllegalArgumentException(profile + " is strict but is missing a query profile type " +
-                                                       "declaration of features " + context.queryFeaturesNotDeclared());
+                    throw new IllegalArgumentException(profile + " is strict but is missing a " +
+                                                       "declaration of inputs " + context.queryFeaturesNotDeclared());
                 else
-                    deployLogger.logApplicationPackage(Level.WARNING, "The following query features used in " +
+                    deployLogger.logApplicationPackage(Level.WARNING, "The following inputs used in " +
                                                                       profile + " are not declared " +
                                                                       "and will be interpreted as scalars, not tensors: " +
                                                                       context.queryFeaturesNotDeclared());
diff --git a/config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionTypeResolverTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionTypeResolverTestCase.java
index c6d6332b4c0..566eb66cdaa 100644
--- a/config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionTypeResolverTestCase.java
+++ b/config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionTypeResolverTestCase.java
@@ -423,8 +423,9 @@ public class RankingExpressionTypeResolverTestCase {
             builder.build(true);
         }
         catch (IllegalArgumentException e) {
-            assertEquals("In schema 'test', rank profile 'my_rank_profile': rank profile 'my_rank_profile' is strict but is missing a query profile type declaration of features [query(bar), query(baz), query(foo)]",
-                    Exceptions.toMessageString(e));
+            assertEquals("In schema 'test', rank profile 'my_rank_profile': rank profile 'my_rank_profile' " +
+                         "is strict but is missing a declaration of inputs [query(bar), query(baz), query(foo)]",
+                         Exceptions.toMessageString(e));
         }
     }
 
@@ -450,11 +451,11 @@ public class RankingExpressionTypeResolverTestCase {
                 "}"
         ));
         builder.build(true);
-        String message = logger.findMessage("The following query features");
+        String message = logger.findMessage("The following inputs");
         assertNotNull(message);
-        assertEquals("WARNING: The following query features used in rank profile 'my_rank_profile' are not declared and " +
-                "will be interpreted as scalars, not tensors: [query(bar), query(baz), query(foo)]",
-                message);
+        assertEquals("WARNING: The following inputs used in rank profile 'my_rank_profile' are not declared and " +
+                     "will be interpreted as scalars, not tensors: [query(bar), query(baz), query(foo)]",
+                     message);
     }
 
     @Test