diff options
Diffstat (limited to 'container-search/src/test/java/com/yahoo/search')
2 files changed, 7 insertions, 12 deletions
diff --git a/container-search/src/test/java/com/yahoo/search/federation/DuplicateSourceTestCase.java b/container-search/src/test/java/com/yahoo/search/federation/DuplicateSourceTestCase.java index cb0d4ab923f..ea29e0a15ff 100644 --- a/container-search/src/test/java/com/yahoo/search/federation/DuplicateSourceTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/federation/DuplicateSourceTestCase.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.search.federation; -import com.google.common.collect.ImmutableList; import com.yahoo.component.ComponentId; import com.yahoo.component.chain.Chain; import com.yahoo.prelude.IndexFacts; @@ -14,7 +13,6 @@ import com.yahoo.search.searchchain.Execution; import com.yahoo.search.searchchain.SearchChainRegistry; import org.junit.jupiter.api.Test; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -38,10 +36,10 @@ public class DuplicateSourceTestCase { SearchChainRegistry searchChains = new SearchChainRegistry(); searchChains.register(new Chain<>("chain1", mockBackendSearcher)); Map<String, List<String>> clusters = new HashMap<>(); - clusters.put("chain1", ImmutableList.of("doc1", "doc2")); - IndexFacts indexFacts = new IndexFacts(new IndexModel(clusters, Collections.emptyList())); + clusters.put("chain1", List.of("doc1", "doc2")); + IndexFacts indexFacts = new IndexFacts(new IndexModel(clusters, List.of())); SearchChainResolver resolver = new SearchChainResolver.Builder() - .addSearchChain(new ComponentId("chain1"), ImmutableList.of("doc1", "doc2")) + .addSearchChain(new ComponentId("chain1"), List.of("doc1", "doc2")) .build(); FederationSearcher searcher = new FederationSearcher(new ComponentId("test"), resolver); diff --git a/container-search/src/test/java/com/yahoo/search/querytransform/test/NGramSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/querytransform/test/NGramSearcherTestCase.java index 8dccf7d0f38..49449153d1f 100644 --- a/container-search/src/test/java/com/yahoo/search/querytransform/test/NGramSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/querytransform/test/NGramSearcherTestCase.java @@ -1,13 +1,10 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.querytransform.test; -import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.google.common.collect.ImmutableList; import com.yahoo.component.chain.Chain; import com.yahoo.language.Language; import com.yahoo.language.simple.SimpleLinguistics; @@ -92,11 +89,11 @@ public class NGramSearcherTestCase { song.addIndex(songDefault); Map<String, List<String>> clusters = new HashMap<>(); - clusters.put("musicOnly", Collections.singletonList(music.getName())); - clusters.put("songOnly", Collections.singletonList(song.getName())); - clusters.put("musicAndSong", Arrays.asList(music.getName(), song.getName())); + clusters.put("musicOnly", List.of(music.getName())); + clusters.put("songOnly", List.of(song.getName())); + clusters.put("musicAndSong", List.of(music.getName(), song.getName())); - IndexFacts indexFacts = new IndexFacts(new IndexModel(clusters, ImmutableList.of(music, song))); + IndexFacts indexFacts = new IndexFacts(new IndexModel(clusters, List.of(music, song))); return new Execution(createSearcher(), Execution.Context.createContextStub(indexFacts)); } |