make date parsing working for latest JDK16 again (#2187)

* make date parsing working for latest JDK16 again, #2186 * ENGLISH not ROOT * make short names of month static
graphhopper · Feb 12, 2021 · 9d4d2ac · 9d4d2ac
1 parent d05e580
commit 9d4d2ac
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,8 +14,8 @@ matrix:
     - jdk: openjdk8
     - env: JDK='OpenJDK 15'
       install: . ./install-jdk.sh -F 15 -C --url 'https://api.adoptopenjdk.net/v3/binary/latest/15/ga/linux/x64/jdk/hotspot/normal/adoptopenjdk'
-    #- env: JDK='OpenJDK 16'
-    #  install: . ./install-jdk.sh -F 16 -C --url 'https://api.adoptopenjdk.net/v3/binary/latest/16/ea/linux/x64/jdk/hotspot/normal/adoptopenjdk'
+    - env: JDK='OpenJDK 16'
+      install: . ./install-jdk.sh -F 16 -C --url 'https://api.adoptopenjdk.net/v3/binary/latest/16/ea/linux/x64/jdk/hotspot/normal/adoptopenjdk'
 
 # avoid default dependency command for maven, 'true' means 'return true' and continue
 install: true

diff --git a/api/src/main/java/com/graphhopper/util/Helper.java b/api/src/main/java/com/graphhopper/util/Helper.java
@@ -343,10 +343,10 @@ public static DateFormat createFormatter() {
     }
 
     /**
-     * Creates a SimpleDateFormat with the UK locale.
+     * Creates a SimpleDateFormat with ENGLISH locale.
      */
     public static DateFormat createFormatter(String str) {
-        DateFormat df = new SimpleDateFormat(str, Locale.UK);
+        DateFormat df = new SimpleDateFormat(str, Locale.ENGLISH);
         df.setTimeZone(UTC);
         return df;
     }

diff --git a/core/files/changelog.txt b/core/files/changelog.txt
@@ -1,6 +1,7 @@
 3.0
     CustomWeighting language breaks old format but is more powerful and easier to read; it also allows factors >1 for server-side CustomModels
-	renamed GHUtilities.setProperties to setSpeed
+    renamed GHUtilities.setProperties to setSpeed
+    Helper.createFormatter is using the ENGLISH Locale instead of UK, see #2186
     the name of an encoded value can only contain lower letters, underscore or numbers. It has to start with a lower letter
     default for GraphHopperMatrixWeb (client for Matrix API) is now the sync POST request without the artificial polling delay in most cases
     refactored TransportationMode to better reflect the usage in source data parsing only

diff --git a/core/src/main/java/com/graphhopper/reader/osm/conditional/DateRangeParser.java b/core/src/main/java/com/graphhopper/reader/osm/conditional/DateRangeParser.java
@@ -20,7 +20,9 @@
 import com.graphhopper.util.Helper;
 
 import java.text.DateFormat;
+import java.text.DateFormatSymbols;
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.List;
@@ -37,11 +39,11 @@
  * @author Robin Boldt
  */
 public class DateRangeParser implements ConditionalValueParser {
-    private static final DateFormat YEAR_MONTH_DAY_DF = createFormatter("yyyy MMM dd");
-    private static final DateFormat MONTH_DAY_DF = createFormatter("MMM dd");
+    private static final DateFormat YEAR_MONTH_DAY_DF = create3CharMonthFormatter("yyyy MMM dd");
+    private static final DateFormat MONTH_DAY_DF = create3CharMonthFormatter("MMM dd");
     private static final DateFormat MONTH_DAY2_DF = createFormatter("dd.MM");
-    private static final DateFormat YEAR_MONTH_DF = createFormatter("yyyy MMM");
-    private static final DateFormat MONTH_DF = createFormatter("MMM");
+    private static final DateFormat YEAR_MONTH_DF = create3CharMonthFormatter("yyyy MMM");
+    private static final DateFormat MONTH_DF = create3CharMonthFormatter("MMM");
     private static final List<String> DAY_NAMES = Arrays.asList("Su", "Mo", "Tu", "We", "Th", "Fr", "Sa");
 
     private Calendar date;
@@ -145,4 +147,12 @@ public static DateRangeParser createInstance(String day) {
         }
         return new DateRangeParser(calendar);
     }
+
+    private static SimpleDateFormat create3CharMonthFormatter(String pattern) {
+        DateFormatSymbols formatSymbols = new DateFormatSymbols(Locale.ENGLISH);
+        formatSymbols.setShortMonths(new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"});
+        SimpleDateFormat df = new SimpleDateFormat(pattern, formatSymbols);
+        df.setTimeZone(Helper.UTC);
+        return df;
+    }
 }