ImmutableSearch -> ImmutableSchema

5 files changed, 11 insertions, 11 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/ImmutableSearch.java b/config-model/src/main/java/com/yahoo/searchdefinition/ImmutableSchema.java
index d0a39524a0e..d0f958741fe 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/ImmutableSearch.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/ImmutableSchema.java
@@ -21,10 +21,10 @@ import java.util.stream.Stream;
  *
  * @author bjorncs
  */
-public interface ImmutableSearch {
+public interface ImmutableSchema {
 
     String getName();
-    Optional<? extends ImmutableSearch> inherited();
+    Optional<? extends ImmutableSchema> inherited();
     Index getIndex(String name);
     ImmutableSDField getConcreteField(String name);
     //TODO split in mutating/immutable by returning List<ImmutableSDField>
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java b/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java
index 889fd20cb92..7f3b018d569 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java
@@ -61,7 +61,7 @@ public class RankProfile implements Cloneable {
     private final String name;
 
     /** The search definition owning this profile, or null if global (owned by a model) */
-    private final ImmutableSearch search;
+    private final ImmutableSchema search;
 
     /** The name of the rank profile inherited by this */
     private String inheritedName = null;
@@ -180,7 +180,7 @@ public class RankProfile implements Cloneable {
     public String getName() { return name; }
 
     /** Returns the search definition owning this, or null if it is global */
-    public ImmutableSearch getSearch() { return search; }
+    public ImmutableSchema getSearch() { return search; }
 
     /** Returns the application this is part of */
     public ApplicationPackage applicationPackage() {
@@ -255,7 +255,7 @@ public class RankProfile implements Cloneable {
         }
     }
 
-    private RankProfile resolveInherited(ImmutableSearch schema) {
+    private RankProfile resolveInherited(ImmutableSchema schema) {
         SDDocumentType documentType = schema.getDocument();
         if (documentType != null) {
             if (name.equals(inheritedName)) {
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/RankProfileRegistry.java b/config-model/src/main/java/com/yahoo/searchdefinition/RankProfileRegistry.java
index 90075343be9..4825da4087e 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/RankProfileRegistry.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/RankProfileRegistry.java
@@ -41,7 +41,7 @@ public class RankProfileRegistry {
         return rankProfileRegistry;
     }
 
-    private String extractName(ImmutableSearch search) {
+    private String extractName(ImmutableSchema search) {
         return search != null ? search.getName() : MAGIC_GLOBAL_RANKPROFILES;
     }
 
@@ -83,7 +83,7 @@ public class RankProfileRegistry {
         return profiles.get(name);
     }
 
-    public RankProfile get(ImmutableSearch schema, String name) {
+    public RankProfile get(ImmutableSchema schema, String name) {
         var profile = get(schema.getName(), name);
         if (profile != null) return profile;
         if (schema.inherited().isPresent()) return get(schema.inherited().get(), name);
@@ -137,7 +137,7 @@ public class RankProfileRegistry {
      * @param search search definition to fetch rank profiles for, or null for the global ones
      * @return Collection of RankProfiles
      */
-    public Collection<RankProfile> rankProfilesOf(ImmutableSearch search) {
+    public Collection<RankProfile> rankProfilesOf(ImmutableSchema search) {
         return rankProfilesOf(extractName(search));
     }
 
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/Schema.java b/config-model/src/main/java/com/yahoo/searchdefinition/Schema.java
index aeab718cda1..637659508c4 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/Schema.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/Schema.java
@@ -46,7 +46,7 @@ import java.util.stream.Stream;
 // TODO: Make a class owned by this, for each of these responsibilities:
 // Managing indexes, managing attributes, managing summary classes.
 // Ensure that after the processing step, all implicit instances of the above types are explicitly represented
-public class Schema implements ImmutableSearch {
+public class Schema implements ImmutableSchema {
 
     private static final String SD_DOC_FIELD_NAME = "sddocname";
     private static final List<String> RESERVED_NAMES = List.of(
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/OnnxModelTransformer.java b/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/OnnxModelTransformer.java
index abfb0c43d84..faf3c8085d8 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/OnnxModelTransformer.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/OnnxModelTransformer.java
@@ -2,7 +2,7 @@
 package com.yahoo.searchdefinition.expressiontransforms;
 
 import com.yahoo.path.Path;
-import com.yahoo.searchdefinition.ImmutableSearch;
+import com.yahoo.searchdefinition.ImmutableSchema;
 import com.yahoo.searchdefinition.OnnxModel;
 import com.yahoo.searchdefinition.RankProfile;
 import com.yahoo.searchlib.rankingexpression.Reference;
@@ -54,7 +54,7 @@ public class OnnxModelTransformer extends ExpressionTransformer<RankProfileTrans
     }
 
     public static ExpressionNode transformFeature(ReferenceNode feature, RankProfile rankProfile) {
-        ImmutableSearch search = rankProfile.getSearch();
+        ImmutableSchema search = rankProfile.getSearch();
         final String featureName = feature.getName();
         if ( ! featureName.equals("onnxModel") && ! featureName.equals("onnx")) return feature;