diff options
author | MariusArhaug <mariusarhaug@hotmail.com> | 2024-04-15 12:25:06 +0200 |
---|---|---|
committer | MariusArhaug <mariusarhaug@hotmail.com> | 2024-04-16 10:33:53 +0200 |
commit | 59ccf886b9f35f12e40334a1aac66eda6819090c (patch) | |
tree | 35779d6394b40aab3c7e4b567fe159f30093fb11 /linguistics | |
parent | 444cdaee63602faf3bee850b9fa4fcb5eb77bc60 (diff) |
fix cr failures
Diffstat (limited to 'linguistics')
3 files changed, 17 insertions, 10 deletions
diff --git a/linguistics/src/main/java/com/yahoo/language/significance/SignificanceModelRegistry.java b/linguistics/src/main/java/com/yahoo/language/significance/SignificanceModelRegistry.java index 6d8dcc00e0a..95d5b5e69d8 100644 --- a/linguistics/src/main/java/com/yahoo/language/significance/SignificanceModelRegistry.java +++ b/linguistics/src/main/java/com/yahoo/language/significance/SignificanceModelRegistry.java @@ -4,10 +4,12 @@ package com.yahoo.language.significance; import com.yahoo.api.annotations.Beta; import com.yahoo.language.Language; +import java.util.Optional; + /** * @author MariusArhaug */ @Beta public interface SignificanceModelRegistry { - SignificanceModel getModel(Language language); + Optional<SignificanceModel> getModel(Language language); } diff --git a/linguistics/src/main/java/com/yahoo/language/significance/impl/DefaultSignificanceModelRegistry.java b/linguistics/src/main/java/com/yahoo/language/significance/impl/DefaultSignificanceModelRegistry.java index d44eab39cdf..1be1d3f13b5 100644 --- a/linguistics/src/main/java/com/yahoo/language/significance/impl/DefaultSignificanceModelRegistry.java +++ b/linguistics/src/main/java/com/yahoo/language/significance/impl/DefaultSignificanceModelRegistry.java @@ -11,6 +11,7 @@ import java.nio.file.Path; import java.util.EnumMap; import java.util.HashMap; import java.util.Map; +import java.util.Optional; import java.util.function.Supplier; import static com.yahoo.yolean.Exceptions.uncheck; @@ -43,12 +44,12 @@ public class DefaultSignificanceModelRegistry implements SignificanceModelRegist @Override - public SignificanceModel getModel(Language language) throws IllegalArgumentException { + public Optional<SignificanceModel> getModel(Language language) { if (!models.containsKey(language)) { - throw new IllegalArgumentException("No model for language " + language); + return Optional.empty(); } - return models.get(language); + return Optional.of(models.get(language)); } diff --git a/linguistics/src/test/java/com/yahoo/language/significance/DefaultSignificanceModelRegistryTest.java b/linguistics/src/test/java/com/yahoo/language/significance/DefaultSignificanceModelRegistryTest.java index d1de63a994d..d4849571b5e 100644 --- a/linguistics/src/test/java/com/yahoo/language/significance/DefaultSignificanceModelRegistryTest.java +++ b/linguistics/src/test/java/com/yahoo/language/significance/DefaultSignificanceModelRegistryTest.java @@ -8,9 +8,7 @@ import org.junit.Test; import java.nio.file.Path; import java.util.HashMap; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.*; /** @@ -27,10 +25,16 @@ public class DefaultSignificanceModelRegistryTest { DefaultSignificanceModelRegistry defaultSignificanceModelRegistry = new DefaultSignificanceModelRegistry(models); - var englishModel = defaultSignificanceModelRegistry.getModel(Language.ENGLISH); - var norwegianModel = defaultSignificanceModelRegistry.getModel(Language.NORWEGIAN_BOKMAL); + var optionalEnglishModel = defaultSignificanceModelRegistry.getModel(Language.ENGLISH); + var optionalNorwegianModel = defaultSignificanceModelRegistry.getModel(Language.NORWEGIAN_BOKMAL); - assertThrows(IllegalArgumentException.class, () -> defaultSignificanceModelRegistry.getModel(Language.FRENCH)); + assertTrue(optionalEnglishModel.isPresent()); + assertTrue(optionalNorwegianModel.isPresent()); + + var englishModel = optionalEnglishModel.get(); + var norwegianModel = optionalNorwegianModel.get(); + + assertTrue( defaultSignificanceModelRegistry.getModel(Language.FRENCH).isEmpty()); assertNotNull(englishModel); assertNotNull(norwegianModel); |