From 76a89b62274060452022ddf24a7685ee2f380cb4 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Fri, 12 Apr 2024 08:30:35 +0200 Subject: Replace all usages of Arrays.asList with List.of where possible. --- .../test/java/com/yahoo/language/LanguageTestCase.java | 3 +-- .../yahoo/language/process/GramSplitterTestCase.java | 4 ++-- .../yahoo/language/process/SegmenterImplTestCase.java | 17 ++++++++--------- .../com/yahoo/language/process/StemmerImplTestCase.java | 13 ++++++------- .../yahoo/language/process/TokenizationTestCase.java | 13 ++++++------- .../java/com/yahoo/language/simple/TokenizerTester.java | 5 ++--- 6 files changed, 25 insertions(+), 30 deletions(-) (limited to 'linguistics') diff --git a/linguistics/src/test/java/com/yahoo/language/LanguageTestCase.java b/linguistics/src/test/java/com/yahoo/language/LanguageTestCase.java index 1b1c9eb21cb..3be57cb21cf 100644 --- a/linguistics/src/test/java/com/yahoo/language/LanguageTestCase.java +++ b/linguistics/src/test/java/com/yahoo/language/LanguageTestCase.java @@ -3,7 +3,6 @@ package com.yahoo.language; import org.junit.Test; -import java.util.Arrays; import java.util.List; import static org.junit.Assert.*; @@ -15,7 +14,7 @@ public class LanguageTestCase { @Test public void requireThatSpecificLanguagesAreCjk() { - List cjk = Arrays.asList(Language.CHINESE_SIMPLIFIED, + List cjk = List.of(Language.CHINESE_SIMPLIFIED, Language.CHINESE_TRADITIONAL, Language.JAPANESE, Language.KOREAN, diff --git a/linguistics/src/test/java/com/yahoo/language/process/GramSplitterTestCase.java b/linguistics/src/test/java/com/yahoo/language/process/GramSplitterTestCase.java index b6e33d70ae6..69094cab8f2 100644 --- a/linguistics/src/test/java/com/yahoo/language/process/GramSplitterTestCase.java +++ b/linguistics/src/test/java/com/yahoo/language/process/GramSplitterTestCase.java @@ -6,8 +6,8 @@ import com.yahoo.language.process.GramSplitter.GramSplitterIterator; import com.yahoo.language.simple.SimpleLinguistics; import org.junit.Test; -import java.util.Arrays; import java.util.Iterator; +import java.util.List; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -220,7 +220,7 @@ public class GramSplitterTestCase { } private void assertGramSplits(String input, int gramSize, String ... expected) { - assertEquals(Arrays.asList(expected), gramSplitter.split(input, gramSize).toExtractedList()); + assertEquals(List.of(expected), gramSplitter.split(input, gramSize).toExtractedList()); } private void assertGramSplit(String input, int gramSize, String expected) { diff --git a/linguistics/src/test/java/com/yahoo/language/process/SegmenterImplTestCase.java b/linguistics/src/test/java/com/yahoo/language/process/SegmenterImplTestCase.java index f4ec53d1f38..7e097736abe 100644 --- a/linguistics/src/test/java/com/yahoo/language/process/SegmenterImplTestCase.java +++ b/linguistics/src/test/java/com/yahoo/language/process/SegmenterImplTestCase.java @@ -8,7 +8,6 @@ import com.yahoo.language.simple.SimpleTokenizer; import org.junit.Test; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import static org.junit.Assert.assertEquals; @@ -22,25 +21,25 @@ public class SegmenterImplTestCase { @Test public void requireThatNonIndexableCharactersAreDelimiters() { - assertSegments("i've", Arrays.asList("i", "ve")); - assertSegments("foo bar. baz", Arrays.asList("foo", "bar", "baz")); - assertSegments("1,2, 3 4", Arrays.asList("1", "2", "3", "4")); + assertSegments("i've", List.of("i", "ve")); + assertSegments("foo bar. baz", List.of("foo", "bar", "baz")); + assertSegments("1,2, 3 4", List.of("1", "2", "3", "4")); } @Test public void requireThatAdjacentIndexableTokenTypesAreNotSplit() { - assertSegments("a1,2b,c3,4d", Arrays.asList("a1", "2b", "c3", "4d")); + assertSegments("a1,2b,c3,4d", List.of("a1", "2b", "c3", "4d")); } @Test public void requireThatSegmentationReturnsOriginalForm() { - assertSegments("a\u030A", Arrays.asList("a\u030A")); - assertSegments("FOO BAR", Arrays.asList("FOO", "BAR")); + assertSegments("a\u030A", List.of("a\u030A")); + assertSegments("FOO BAR", List.of("FOO", "BAR")); } @Test public void requireThatEmptyInputIsPreserved() { - assertSegments("", Arrays.asList("")); + assertSegments("", List.of("")); } private static void assertSegments(String input, List expectedSegments) { @@ -51,7 +50,7 @@ public class SegmenterImplTestCase { public void requireThatEmptyStringsAreSuppressed() { Tokenizer fancyTokenizer = new FancyTokenizer(); Segmenter fancySegmenter = new SegmenterImpl(fancyTokenizer); - List expectedSegments = Arrays.asList("juice", "\u00BD", "oz"); + List expectedSegments = List.of("juice", "\u00BD", "oz"); String input = "juice \u00BD oz"; assertEquals(expectedSegments, fancySegmenter.segment(input, Language.ENGLISH)); } diff --git a/linguistics/src/test/java/com/yahoo/language/process/StemmerImplTestCase.java b/linguistics/src/test/java/com/yahoo/language/process/StemmerImplTestCase.java index 9c5914baeb9..785225a5096 100644 --- a/linguistics/src/test/java/com/yahoo/language/process/StemmerImplTestCase.java +++ b/linguistics/src/test/java/com/yahoo/language/process/StemmerImplTestCase.java @@ -8,7 +8,6 @@ import com.yahoo.language.simple.SimpleTokenizer; import org.junit.Test; import org.mockito.Mockito; -import java.util.Arrays; import java.util.List; import java.util.ArrayList; @@ -21,13 +20,13 @@ public class StemmerImplTestCase { @Test public void requireThatStemIsNormalizedAndLowerCased() { - assertStem("FOO", Arrays.asList("foo")); - assertStem("a\u030A", Arrays.asList("\u00E5")); + assertStem("FOO", List.of("foo")); + assertStem("a\u030A", List.of("\u00E5")); } @Test public void requireThatOnlyIndexableTokensAreReturned() { - assertStem("foo. (bar)!", Arrays.asList("foo", "bar")); + assertStem("foo. (bar)!", List.of("foo", "bar")); } @Test @@ -43,17 +42,17 @@ public class StemmerImplTestCase { Tokenizer tokenizer = Mockito.mock(Tokenizer.class); Mockito.when(tokenizer.tokenize(Mockito.anyString(), Mockito.any(), Mockito.any(), Mockito.anyBoolean())) - .thenReturn(Arrays.asList(token)); + .thenReturn(List.of(token)); Stemmer stemmer = new StemmerImpl(tokenizer); token.setSpecialToken(false); - assertEquals(Arrays.asList(new StemList("c"), + assertEquals(List.of(new StemList("c"), new StemList("p"), new StemList("p")), stemmer.stem("c++", StemMode.SHORTEST, Language.ENGLISH)); token.setSpecialToken(true); - assertEquals(Arrays.asList(new StemList("c++")), + assertEquals(List.of(new StemList("c++")), stemmer.stem("c++", StemMode.SHORTEST, Language.ENGLISH)); } diff --git a/linguistics/src/test/java/com/yahoo/language/process/TokenizationTestCase.java b/linguistics/src/test/java/com/yahoo/language/process/TokenizationTestCase.java index cf5a26c1f04..2cfb6c33b93 100644 --- a/linguistics/src/test/java/com/yahoo/language/process/TokenizationTestCase.java +++ b/linguistics/src/test/java/com/yahoo/language/process/TokenizationTestCase.java @@ -7,7 +7,6 @@ import org.junit.Test; import java.util.ArrayList; -import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; @@ -31,23 +30,23 @@ public class TokenizationTestCase { @Test public void testTokenizer() { assertTokenize("This is a test, 123", - Arrays.asList("this", "is", "a", "test", "123"), - Arrays.asList("This", " ", "is", " ", "a", " ", "test", ",", " ", "123")); + List.of("this", "is", "a", "test", "123"), + List.of("This", " ", "is", " ", "a", " ", "test", ",", " ", "123")); } @Test public void testUnderScoreTokenization() { - assertTokenize("ugcapi_1", Language.ENGLISH, StemMode.SHORTEST, true, Arrays.asList("ugcapi", "1"), null); + assertTokenize("ugcapi_1", Language.ENGLISH, StemMode.SHORTEST, true, List.of("ugcapi", "1"), null); } @Test public void testPhrasesWithPunctuation() { assertTokenize("PHY_101.html a space/time or space-time course", Language.ENGLISH, StemMode.NONE, false, - Arrays.asList("phy", "101", "html", "a", "space", "time", "or", "space", "time", "course"), + List.of("phy", "101", "html", "a", "space", "time", "or", "space", "time", "course"), null); - assertTokenize("PHY_101.", Language.ENGLISH, StemMode.NONE, false, Arrays.asList("phy", "101"), null); - assertTokenize("101.3", Language.ENGLISH, StemMode.NONE, false, Arrays.asList("101", "3"), null); + assertTokenize("PHY_101.", Language.ENGLISH, StemMode.NONE, false, List.of("phy", "101"), null); + assertTokenize("101.3", Language.ENGLISH, StemMode.NONE, false, List.of("101", "3"), null); } @Test diff --git a/linguistics/src/test/java/com/yahoo/language/simple/TokenizerTester.java b/linguistics/src/test/java/com/yahoo/language/simple/TokenizerTester.java index 401b89f0696..021f04b8b87 100644 --- a/linguistics/src/test/java/com/yahoo/language/simple/TokenizerTester.java +++ b/linguistics/src/test/java/com/yahoo/language/simple/TokenizerTester.java @@ -8,7 +8,6 @@ import com.yahoo.language.process.Token; import com.yahoo.language.process.TokenScript; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import static org.junit.Assert.assertEquals; @@ -28,7 +27,7 @@ public class TokenizerTester { for (Token token : tokenize(input)) { findTokenStrings(token, actual); } - assertEquals(Arrays.asList(expectedTokenStrings), actual); + assertEquals(List.of(expectedTokenStrings), actual); } public void assertTokenScripts(String input, TokenScript... expectedTokenScripts) { @@ -36,7 +35,7 @@ public class TokenizerTester { for (Token token : tokenize(input)) { findTokenScripts(token, actual); } - assertEquals(Arrays.asList(expectedTokenScripts), actual); + assertEquals(List.of(expectedTokenScripts), actual); } public List findTokenStrings(Token token, List out) { -- cgit v1.2.3