Protect against Y2.1K

jpos · Dec 6, 2023 · 3c9d0b5 · 3c9d0b5
1 parent d62cca5
commit 3c9d0b5
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 8 deletions.
diff --git a/jpos/src/main/java/org/jpos/iso/ISODate.java b/jpos/src/main/java/org/jpos/iso/ISODate.java
@@ -167,25 +167,26 @@ public static Date parseISODate (String d, long currentTime) {
      */
     public static Date parseISODate (String d, long currentTime, TimeZone timeZone) {
         int YY = 0;
+
+        Calendar cal = new GregorianCalendar();
+        cal.setTimeZone(timeZone);
+        Date now = new Date(currentTime);
+        cal.setTime (now);
+
         if (d.length() == 14) {
             YY = Integer.parseInt(d.substring (0, 4));
             d = d.substring (4);
         }
         else if (d.length() == 12) {
-            YY = 2000 + Integer.parseInt(d.substring (0, 2));
+            YY = calculateNearestFullYear(Integer.parseInt(d.substring(0, 2)), cal);
             d = d.substring (2);
         } 
         int MM = Integer.parseInt(d.substring (0, 2))-1;
         int DD = Integer.parseInt(d.substring (2, 4));
         int hh = Integer.parseInt(d.substring (4, 6));
         int mm = Integer.parseInt(d.substring (6, 8));
         int ss = Integer.parseInt(d.substring (8,10));
-
-        Calendar cal = new GregorianCalendar();
-        cal.setTimeZone(timeZone);
-        Date now = new Date(currentTime);
-
-        cal.setTime (now);
+
         cal.set (Calendar.MONTH, MM);
         cal.set (Calendar.DATE, DD);
         cal.set (Calendar.HOUR_OF_DAY, hh);
@@ -323,5 +324,29 @@ public static String getJulianDate(Date d, TimeZone timeZone) {
       year = year.substring(1);
       return year + day;
     }
-}
 
+    /**
+     * Calculates the closest year in full YYYY format based on a two-digit year input.
+     * The closest year is determined in relation to the current year provided by the Calendar instance.
+     *
+     * @param year The two-digit year to be converted (e.g., 23 for 2023 or 2123).
+     * @param now  The current date provided as a Calendar instance used for reference.
+     * @return The closest full year in YYYY format.
+     * @throws IllegalArgumentException if the input year is not between 0 and 99.
+     */
+    private static int calculateNearestFullYear(int year, Calendar now) {
+        if (year < 0 || year > 99) {
+            throw new IllegalArgumentException("Year must be between 0 and 99");
+        }
+
+        int currentYear = now.get(Calendar.YEAR); // e.g., 2023
+        int currentCentury = currentYear - currentYear % 100; // e.g., 2000 for 2023
+        int possibleYear = currentCentury + year; // e.g., 2023 for year 23
+
+        // Adjust to the closest century if needed
+        if (Math.abs(year - currentYear % 100) > 50) {
+            possibleYear += (year > currentYear % 100) ? -100 : 100;
+        }
+        return possibleYear;
+    }
+}
diff --git a/jpos/src/test/java/org/jpos/iso/ISODateTest.java b/jpos/src/test/java/org/jpos/iso/ISODateTest.java
@@ -23,6 +23,7 @@
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.Calendar;
 import java.util.Date;
@@ -184,4 +185,11 @@ public void testParseISODate2DigitYear() {
         java.util.Date result = ISODate.parseISODate("101227235657", aus);
         assertThat(result.getTime(), is(1293458217000L));
     }
+
+    @Test
+    public void testPivotYear() {
+        Date future = ISODate.parseISODate("20990101000000");
+        assertEquals ("202306", ISODate.formatDate(ISODate.parseISODate("230601000000"), "yyyyMM"));
+        assertEquals ("210106", ISODate.formatDate(ISODate.parseISODate("010601000000", future.getTime()), "yyyyMM"));
+    }
 }