Remove on Vespa 8

1 files changed, 2 insertions, 3 deletions

diff --git a/config-model/src/main/javacc/SchemaParser.jj b/config-model/src/main/javacc/SchemaParser.jj
index 97d5925097f..2374098697d 100644
--- a/config-model/src/main/javacc/SchemaParser.jj
+++ b/config-model/src/main/javacc/SchemaParser.jj
@@ -1630,7 +1630,7 @@ void rankingConstant(ParsedSchema schema) :
 {
     ( <CONSTANT> name = identifier() lbrace()
       (path = fileItem() { pathType = DistributableResource.PathType.FILE; }
-       | path = uriItem() { pathType = DistributableResource.PathType.URI; } // Undocumented. TODO: Remove on Vespa 8
+       | path = uriItem() { pathType = DistributableResource.PathType.URI; } // Undocumented. Remove?
        | type = tensorTypeWithPrefix(rankingConstantErrorMessage(name)) (<NL>)*
       )+
       <RBRACE>
@@ -1789,8 +1789,7 @@ void function(ParsedRankProfile profile) :
         func.setInline(inline);
         var old = profile.addOrReplaceFunction(func);
         if (old != null) {
-            /* TODO disallow this for Vespa 8 */
-            deployLogger.logApplicationPackage(Level.WARNING, "Function '" + func.name()
+            throw new IllegalArgumentException("Function '" + func.name()
                                                + "' is defined twice in rank profile '"
                                                + profile.name() + "'");
         }