Revert "Merge pull request #22589 from vespa-engine/revert-22582-bratseth/constants-cleanup-take-2"

This reverts commit 79537b954556ba6985f2c59b4bc44b971a385eb0, reversing
changes made to 1df3b3c59251bd4fd1b099ae5cfb4c280313e76d.

1 files changed, 8 insertions, 1 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/DerivedConfiguration.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/DerivedConfiguration.java
index 8dec0e8339a..50029613b2e 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/DerivedConfiguration.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/DerivedConfiguration.java
@@ -12,6 +12,7 @@ import com.yahoo.searchdefinition.RankProfileRegistry;
 import com.yahoo.searchdefinition.Schema;
 import com.yahoo.searchdefinition.derived.validation.Validation;
 import com.yahoo.vespa.config.search.AttributesConfig;
+import com.yahoo.vespa.config.search.core.RankingConstantsConfig;
 import com.yahoo.vespa.model.container.search.QueryProfiles;
 
 import java.io.IOException;
@@ -81,7 +82,7 @@ public class DerivedConfiguration implements AttributesConfig.Producer {
             summaries = new Summaries(schema, deployState.getDeployLogger(), deployState.getProperties().featureFlags());
             summaryMap = new SummaryMap(schema);
             juniperrc = new Juniperrc(schema);
-            rankProfileList = new RankProfileList(schema, schema.rankingConstants(), schema.rankExpressionFiles(),
+            rankProfileList = new RankProfileList(schema, schema.constants(), schema.rankExpressionFiles(),
                                                   schema.onnxModels(), attributeFields, deployState);
             indexingScript = new IndexingScript(schema);
             indexInfo = new IndexInfo(schema);
@@ -127,6 +128,12 @@ public class DerivedConfiguration implements AttributesConfig.Producer {
         exportCfg(new QueryProfiles(queryProfileRegistry, (level, message) -> {}).getConfig(), toDirectory + "/" + "query-profiles.cfg");
     }
 
+    public void exportConstants(String toDirectory) throws IOException {
+        RankingConstantsConfig.Builder b = new RankingConstantsConfig.Builder();
+        rankProfileList.getConfig(b);
+        exportCfg(b.build(), toDirectory + "/" + "ranking-constants.cfg");
+    }
+
     private static void exportCfg(ConfigInstance instance, String fileName) throws IOException {
         Writer writer = null;
         try {