Merge pull request #26537 from vespa-engine/arnej/add-stateless-settings-in-schemav8.144.19

Arnej/add stateless settings in schema

3 files changed, 11 insertions, 2 deletions

diff --git a/config-model/src/main/java/com/yahoo/schema/derived/Derived.java b/config-model/src/main/java/com/yahoo/schema/derived/Derived.java
index 9943a02a2f2..e8b12f22b20 100644
--- a/config-model/src/main/java/com/yahoo/schema/derived/Derived.java
+++ b/config-model/src/main/java/com/yahoo/schema/derived/Derived.java
@@ -95,7 +95,7 @@ public abstract class Derived implements Exportable {
      * @param toDirectory the directory to export to, or null
      *
      */
-    public final void export(String toDirectory) throws IOException {
+    public void export(String toDirectory) throws IOException {
         Writer writer = null;
         try {
             String fileName = getDerivedName() + ".cfg";
diff --git a/config-model/src/main/java/com/yahoo/schema/derived/FileDistributedOnnxModels.java b/config-model/src/main/java/com/yahoo/schema/derived/FileDistributedOnnxModels.java
index 4196af18fb6..e3c697e3262 100644
--- a/config-model/src/main/java/com/yahoo/schema/derived/FileDistributedOnnxModels.java
+++ b/config-model/src/main/java/com/yahoo/schema/derived/FileDistributedOnnxModels.java
@@ -16,10 +16,13 @@ import java.util.logging.Logger;
  *
  * @author bratseth
  */
-public class FileDistributedOnnxModels {
+public class FileDistributedOnnxModels extends Derived implements OnnxModelsConfig.Producer {
 
     private static final Logger log = Logger.getLogger(FileDistributedOnnxModels.class.getName());
 
+    @Override
+    public String getDerivedName() { return "onnx-models"; }
+
     private final Map<String, OnnxModel> models;
 
     public FileDistributedOnnxModels(FileRegistry fileRegistry, Collection<OnnxModel> models) {
diff --git a/config-model/src/main/java/com/yahoo/schema/derived/RankProfileList.java b/config-model/src/main/java/com/yahoo/schema/derived/RankProfileList.java
index c254385a96e..a50ddd4aeea 100644
--- a/config-model/src/main/java/com/yahoo/schema/derived/RankProfileList.java
+++ b/config-model/src/main/java/com/yahoo/schema/derived/RankProfileList.java
@@ -193,6 +193,12 @@ public class RankProfileList extends Derived implements RankProfilesConfig.Produ
     public String getDerivedName() { return "rank-profiles"; }
 
     @Override
+    public void export(String toDirectory) throws java.io.IOException {
+        super.export(toDirectory);
+        onnxModels.export(toDirectory);
+    }
+
+    @Override
     public void getConfig(RankProfilesConfig.Builder builder) {
         for (RawRankProfile rank : rankProfiles.values() ) {
             rank.getConfig(builder);