OPENNLP-1753: Switch to Models v1.3 (OpenNLP 2.x)

- adds missing newly supported lang codes to DownloadUtil's internal map
- adds missing newly supported lang codes to AbstractModelLoaderTest classes

Author: mawiesne

opennlp-tools/src/main/java/opennlp/tools/util/DownloadUtil.java

@@ -273,6 +273,8 @@ private Map<String, Map<ModelType, String>> toMap(List<String> links) {
             addModel("nl", link, result);
           } else if (link.contains("fr-ud")) { // French
             addModel("fr", link, result);
+          } else if (link.contains("af-ud")) { // Afrikaans
+            addModel("af", link, result);
           } else if (link.contains("bg-ud")) { // Bulgarian
             addModel("bg", link, result);
           } else if (link.contains("ca-ud")) { // Catalan
@@ -291,12 +293,18 @@ private Map<String, Map<ModelType, String>> toMap(List<String> links) {
             addModel("et", link, result);
           } else if (link.contains("eu-ud")) { // Basque
             addModel("eu", link, result);
+          } else if (link.contains("fa-ud")) { // Persian
+            addModel("fa", link, result);
           } else if (link.contains("fi-ud")) { // Finnish
             addModel("fi", link, result);
+          } else if (link.contains("ga-ud")) { // Irish
+            addModel("ga", link, result);
           } else if (link.contains("hy-ud")) { // Armenian
             addModel("hy", link, result);
           } else if (link.contains("is-ud")) { // Icelandic
             addModel("is", link, result);
+          } else if (link.contains("id-ud")) { // Indonesian
+            addModel("id", link, result);
           } else if (link.contains("ka-ud")) { // Georgian
             addModel("ka", link, result);
           } else if (link.contains("kk-ud")) { // Kazakh

opennlp-tools/src/test/java/opennlp/tools/AbstractModelLoaderTest.java

@@ -41,10 +41,10 @@ public abstract class AbstractModelLoaderTest {
   protected static final String VER = "1.3-2.5.4";
   protected static final String BIN = ".bin";
   protected static List<String> SUPPORTED_LANG_CODES = List.of(
-          "en", "fr", "de", "it", "nl", "bg", "ca", "cs", "da", "el",
-          "es", "et", "eu", "fi", "hr", "hy", "is", "ka", "kk", "ko",
-          "lv", "no", "pl", "pt", "ro", "ru", "sk", "sl", "sr", "sv",
-          "tr", "uk");
+          "af", "en", "fr", "de", "it", "nl", "bg", "ca", "cs", "da", "el",
+          "es", "et", "eu", "fa", "fi", "ga", "hr", "hy", "id", "is", "ka",
+          "kk", "ko", "lv", "no", "pl", "pt", "ro", "ru", "sk", "sl", "sr",
+          "sv", "tr", "uk");
 
   protected static void downloadVersion15Model(String modelName) throws IOException {
     downloadModel(new URL(BASE_URL_MODELS_V15 + modelName));

opennlp-tools/src/test/java/opennlp/tools/util/DownloadParserTest.java

@@ -47,7 +47,7 @@ void testAvailableModels(String language, Map<ModelType, String> expectedModels)
     Map<String, Map<ModelType, String>> result = downloadParser.getAvailableModels();
 
     assertNotNull(result);
-    assertEquals(32, result.size());
+    assertEquals(36, result.size());
 
     final Map<ModelType, String> availableModels = result.get(language);
     assertNotNull(availableModels);