use jdk17 ga and jdk18 ea (graphhopper#2419)

* use jdk17 ga and jdk18 ea

* adoptopenjdk is adoptium and I cannot find ea versions, so use the default ones (sormuras/bach -> install-jdk.properties)

* since jdk17 locale IDs changed

Author: karussell

.travis.yml

@@ -12,10 +12,10 @@ env:
 matrix:
   include:
     - jdk: openjdk8
-    - env: JDK='OpenJDK 16'
-      install: . ./install-jdk.sh -F 16 -C --url 'https://api.adoptopenjdk.net/v3/binary/latest/16/ga/linux/x64/jdk/hotspot/normal/adoptopenjdk'
     - env: JDK='OpenJDK 17'
-      install: . ./install-jdk.sh -F 17 -C --url 'https://api.adoptopenjdk.net/v3/binary/latest/17/ea/linux/x64/jdk/hotspot/normal/adoptopenjdk'
+      install: . ./install-jdk.sh -F 17 -C
+    - env: JDK='OpenJDK 18'
+      install: . ./install-jdk.sh -F ea -C
 
 # avoid default dependency command for maven, 'true' means 'return true' and continue
 install: true

core/src/main/java/com/graphhopper/util/TranslationMap.java

@@ -85,14 +85,18 @@ public void add(Translation tr) {
         if (!locale.getCountry().isEmpty() && !translations.containsKey(tr.getLanguage()))
             translations.put(tr.getLanguage(), tr);
 
-        // Map old Java 'standard' to latest, Java is a bit ugly here: http://stackoverflow.com/q/13974169/194609
-        // Hebrew
-        if ("iw".equals(locale.getLanguage()))
-            translations.put("he", tr);
-
-        // Indonesia
-        if ("in".equals(locale.getLanguage()))
-            translations.put("id", tr);
+        // Hebrew locale was "iw" in old JDKs but is now he
+        // required in old JDKs:
+        if ("iw".equals(locale.getLanguage())) translations.put("he", tr);
+        // required since jdk17 to still provide translation for "iw":
+        if ("he".equals(locale.getLanguage())) translations.put("iw", tr);
+
+        // Indonesia locale was "in_ID" in old JDKs but is now id_ID
+        // required in old JDKs:
+        if ("in".equals(locale.getLanguage())) translations.put("id", tr);
+        // required since jdk17 to still provide translation for "in":
+        if ("id".equals(locale.getLanguage())) translations.put("in", tr);
+        // Indian locales are: en-IN and hi-IN and are not overwritten by that
     }
 
     /**

core/src/test/java/com/graphhopper/util/TranslationMapTest.java

@@ -19,6 +19,7 @@
 
 import org.junit.jupiter.api.Test;
 
+import java.util.Arrays;
 import java.util.Locale;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -60,8 +61,11 @@ public void testToString() {
         assertEquals("רגל", trMap.tr("web.FOOT"));
 
         // Indonesian
-        assertEquals("in", SINGLETON.get("in").getLanguage());
-        assertEquals("in", SINGLETON.get("in_ID").getLanguage());
+        // for jdk17 and later "id" is returned, before "in" was returned
+        String lang = SINGLETON.get("id").getLanguage();
+        assertTrue(Arrays.asList("id", "in").contains(lang));
+        assertEquals(lang, SINGLETON.get("in").getLanguage());
+        assertEquals(lang, SINGLETON.get("in_ID").getLanguage());
 
         // Vietnamese
         assertEquals("vi", SINGLETON.get("vi").getLanguage());