Refactor: macro -> function

1 files changed, 0 insertions, 55 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ReservedMacroNames.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ReservedMacroNames.java
deleted file mode 100644
index adcebed9254..00000000000
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ReservedMacroNames.java
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.searchdefinition.processing;
-
-import com.google.common.collect.ImmutableSet;
-import com.yahoo.config.application.api.DeployLogger;
-import com.yahoo.searchdefinition.RankProfile;
-import com.yahoo.searchdefinition.RankProfileRegistry;
-import com.yahoo.searchdefinition.Search;
-import com.yahoo.searchlib.rankingexpression.parser.RankingExpressionParserConstants;
-import com.yahoo.vespa.model.container.search.QueryProfiles;
-
-import java.util.Set;
-import java.util.logging.Level;
-
-/**
- * Issues a warning if some macro has a reserved name. This is not necessarily
- * an error, as a macro can shadow a built-in function.
- *
- * @author lesters
- */
-public class ReservedMacroNames extends Processor {
-
-    private static Set<String> reservedNames = getReservedNames();
-
-    public ReservedMacroNames(Search search, DeployLogger deployLogger, RankProfileRegistry rankProfileRegistry, QueryProfiles queryProfiles) {
-        super(search, deployLogger, rankProfileRegistry, queryProfiles);
-    }
-
-    @Override
-    public void process(boolean validate) {
-        if ( ! validate) return;
-
-        for (RankProfile rp : rankProfileRegistry.all()) {
-            for (String macroName : rp.getMacros().keySet()) {
-                if (reservedNames.contains(macroName)) {
-                    deployLogger.log(Level.WARNING, "Macro \"" + macroName + "\" " +
-                                                    "in rank profile \"" + rp.getName() + "\" " +
-                                                    "has a reserved name. This might mean that the macro shadows " +
-                                                    "the built-in function with the same name."
-                    );
-                }
-            }
-        }
-    }
-
-    private static ImmutableSet<String> getReservedNames() {
-        ImmutableSet.Builder<String> names = ImmutableSet.builder();
-        for (String token : RankingExpressionParserConstants.tokenImage) {
-            String tokenWithoutQuotes = token.substring(1, token.length()-1);
-            names.add(tokenWithoutQuotes);
-        }
-        return names.build();
-    }
-
-}