Merge pull request #25096 from vespa-engine/revert-25091-revert-25088-balder/immutablelist-2-listv8.94.46

Revert "Revert "Let list handling catch up with Java 17""

1 files changed, 4 insertions, 14 deletions

diff --git a/config-model/src/test/java/com/yahoo/schema/processing/RankProfileSearchFixture.java b/config-model/src/test/java/com/yahoo/schema/processing/RankProfileSearchFixture.java
index 15fe8250b71..58c514bdda8 100644
--- a/config-model/src/test/java/com/yahoo/schema/processing/RankProfileSearchFixture.java
+++ b/config-model/src/test/java/com/yahoo/schema/processing/RankProfileSearchFixture.java
@@ -1,7 +1,6 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.schema.processing;
 
-import com.google.common.collect.ImmutableList;
 import com.yahoo.config.application.api.ApplicationPackage;
 import ai.vespa.rankingexpression.importer.configmodelview.MlModelImporter;
 import com.yahoo.config.model.application.provider.BaseDeployLogger;
@@ -37,10 +36,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
  */
 class RankProfileSearchFixture {
 
-    private final ImmutableList<MlModelImporter> importers = ImmutableList.of(new TensorFlowImporter(),
-                                                                              new OnnxImporter(),
-                                                                              new LightGBMImporter(),
-                                                                              new XGBoostImporter());
+    private final List<MlModelImporter> importers = List.of(new TensorFlowImporter(),
+                                                            new OnnxImporter(),
+                                                            new LightGBMImporter(),
+                                                            new XGBoostImporter());
     private final RankProfileRegistry rankProfileRegistry = new RankProfileRegistry();
     private final QueryProfileRegistry queryProfileRegistry;
     private final Schema schema;
@@ -51,10 +50,6 @@ class RankProfileSearchFixture {
         return rankProfileRegistry;
     }
 
-    public QueryProfileRegistry getQueryProfileRegistry() {
-        return queryProfileRegistry;
-    }
-
     RankProfileSearchFixture(String rankProfiles) throws ParseException {
         this(MockApplicationPackage.createEmpty(), new QueryProfileRegistry(), rankProfiles);
     }
@@ -113,11 +108,6 @@ class RankProfileSearchFixture {
         return compiled;
     }
 
-    /** Returns the given uncompiled profile */
-    public RankProfile rankProfile(String rankProfile) {
-        return rankProfileRegistry.get(schema, rankProfile);
-    }
-
     /** Returns the given compiled profile, or null if not compiled yet or not present at all */
     public RankProfile compiledRankProfile(String rankProfile) {
         return compiledRankProfiles.get(rankProfile);