Allow min/max dates

Provide some form of support for date-times up to the min/max of Long
At the margins, calculations will be slightly imperfect
UTC is used for the min/max
Fixes #297
Fixes #190

Author: jodastephen

RELEASE-NOTES.txt

@@ -31,6 +31,10 @@ Changes in 2.8.3
 
 - Add Czech period translations [#313]
 
+- Allow DateTime and Interval to refer to values at Long.MIN_VALUE and Long.MAX_VALUE [#297, #190]
+  A DateTime may be created with any millisecond value, however at the very edges there may be
+  some undesirable effects, for example alway using UTC instead of the time-zone
+
 - Fix overflow bug in intervals [#315]
 
 - Better error message for malformed tzdb files [#319]

src/main/java/org/joda/time/DateTimeField.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2005 Stephen Colebourne
+ *  Copyright 2001-2015 Stephen Colebourne
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -378,6 +378,20 @@ public abstract class DateTimeField {
      */
     public abstract long set(long instant, int value);
 
+    /**
+     * Sets a value in the milliseconds supplied, allowing a little leniency at the margins.
+     * <p>
+     * This is primarily an internal method used by parsing.
+     * 
+     * @param instant  the milliseconds from 1970-01-01T00:00:00Z to set in
+     * @param value  the value to set, in the units of the field
+     * @return the updated milliseconds
+     * @throws IllegalArgumentException if the value is invalid
+     */
+    public long setExtended(long instant, int value) {
+        return set(instant, value);
+    }
+
     /**
      * Sets a value using the specified partial instant.
      * <p>

src/main/java/org/joda/time/base/BaseDateTime.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2011 Stephen Colebourne
+ *  Copyright 2001-2015 Stephen Colebourne
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -124,10 +124,7 @@ public BaseDateTime(long instant, Chronology chronology) {
         super();
         iChronology = checkChronology(chronology);
         iMillis = checkInstant(instant, iChronology);
-        // validate not over maximum
-        if (iChronology.year().isSupported()) {
-            iChronology.year().set(iMillis, iChronology.year().get(iMillis));
-        }
+        adjustForMinMax();
     }
 
     //-----------------------------------------------------------------------
@@ -152,6 +149,7 @@ public BaseDateTime(Object instant, DateTimeZone zone) {
         Chronology chrono = checkChronology(converter.getChronology(instant, zone));
         iChronology = chrono;
         iMillis = checkInstant(converter.getInstantMillis(instant, chrono), chrono);
+        adjustForMinMax();
     }
 
     /**
@@ -173,6 +171,7 @@ public BaseDateTime(Object instant, Chronology chronology) {
         InstantConverter converter = ConverterManager.getInstance().getInstantConverter(instant);
         iChronology = checkChronology(converter.getChronology(instant, chronology));
         iMillis = checkInstant(converter.getInstantMillis(instant, chronology), iChronology);
+        adjustForMinMax();
     }
 
     //-----------------------------------------------------------------------
@@ -258,6 +257,13 @@ public BaseDateTime(
         long instant = iChronology.getDateTimeMillis(year, monthOfYear, dayOfMonth,
             hourOfDay, minuteOfHour, secondOfMinute, millisOfSecond);
         iMillis = checkInstant(instant, iChronology);
+        adjustForMinMax();
+    }
+
+    private void adjustForMinMax() {
+        if (iMillis == Long.MIN_VALUE || iMillis == Long.MAX_VALUE) {
+            iChronology = iChronology.withUTC();
+        }
     }
 
     //-----------------------------------------------------------------------

src/main/java/org/joda/time/chrono/BasicChronology.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2014 Stephen Colebourne
+ *  Copyright 2001-2015 Stephen Colebourne
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -146,6 +146,7 @@ public DateTimeZone getZone() {
         return DateTimeZone.UTC;
     }
 
+    @Override
     public long getDateTimeMillis(
             int year, int monthOfYear, int dayOfMonth, int millisOfDay)
             throws IllegalArgumentException {
@@ -156,9 +157,10 @@ public long getDateTimeMillis(
 
         FieldUtils.verifyValueBounds
             (DateTimeFieldType.millisOfDay(), millisOfDay, 0, DateTimeConstants.MILLIS_PER_DAY - 1);
-        return getDateMidnightMillis(year, monthOfYear, dayOfMonth) + millisOfDay;
+        return getDateTimeMillis0(year, monthOfYear, dayOfMonth, millisOfDay);
     }
 
+    @Override
     public long getDateTimeMillis(
             int year, int monthOfYear, int dayOfMonth,
             int hourOfDay, int minuteOfHour, int secondOfMinute, int millisOfSecond)
@@ -173,12 +175,29 @@ public long getDateTimeMillis(
         FieldUtils.verifyValueBounds(DateTimeFieldType.minuteOfHour(), minuteOfHour, 0, 59);
         FieldUtils.verifyValueBounds(DateTimeFieldType.secondOfMinute(), secondOfMinute, 0, 59);
         FieldUtils.verifyValueBounds(DateTimeFieldType.millisOfSecond(), millisOfSecond, 0, 999);
-
-        return getDateMidnightMillis(year, monthOfYear, dayOfMonth)
-            + hourOfDay * DateTimeConstants.MILLIS_PER_HOUR
-            + minuteOfHour * DateTimeConstants.MILLIS_PER_MINUTE
-            + secondOfMinute * DateTimeConstants.MILLIS_PER_SECOND
-            + millisOfSecond;
+        long millisOfDay = hourOfDay * DateTimeConstants.MILLIS_PER_HOUR
+                        + minuteOfHour * DateTimeConstants.MILLIS_PER_MINUTE
+                        + secondOfMinute * DateTimeConstants.MILLIS_PER_SECOND
+                        + millisOfSecond;
+        return getDateTimeMillis0(year, monthOfYear, dayOfMonth, (int) millisOfDay);
+    }
+
+    private long getDateTimeMillis0(int year, int monthOfYear, int dayOfMonth, int millisOfDay) {
+        long dayInstant = getDateMidnightMillis(year, monthOfYear, dayOfMonth);
+        // try reversed calculation from next day for MIN
+        if (dayInstant == Long.MIN_VALUE) {
+            dayInstant = getDateMidnightMillis(year, monthOfYear, dayOfMonth + 1);
+            millisOfDay  = millisOfDay - 86400000;
+        }
+        // check for limit caused by millisOfDay addition
+        // even if dayInstant already MIN or MAX, this still works fine with int math
+        long result = dayInstant + millisOfDay;
+        if (result  < 0 && dayInstant > 0) {
+            return Long.MAX_VALUE;
+        } else if (result  > 0 && dayInstant < 0) {
+            return Long.MIN_VALUE;
+        }
+        return result;
     }
 
     public int getMinimumDaysInFirstWeek() {
@@ -608,10 +627,17 @@ int getDaysInMonthMaxForSet(long instant, int value) {
      * @return the milliseconds
      */
     long getDateMidnightMillis(int year, int monthOfYear, int dayOfMonth) {
-        FieldUtils.verifyValueBounds(DateTimeFieldType.year(), year, getMinYear(), getMaxYear());
+        FieldUtils.verifyValueBounds(DateTimeFieldType.year(), year, getMinYear() - 1, getMaxYear() + 1);
         FieldUtils.verifyValueBounds(DateTimeFieldType.monthOfYear(), monthOfYear, 1, getMaxMonth(year));
         FieldUtils.verifyValueBounds(DateTimeFieldType.dayOfMonth(), dayOfMonth, 1, getDaysInYearMonth(year, monthOfYear));
-        return getYearMonthDayMillis(year, monthOfYear, dayOfMonth);
+        long instant = getYearMonthDayMillis(year, monthOfYear, dayOfMonth);
+        // check for limit caused by min/max year +1/-1
+        if (instant < 0 && year == getMaxYear() + 1) {
+            return Long.MAX_VALUE;
+        } else if (instant > 0 && year == getMinYear() - 1) {
+            return Long.MIN_VALUE;
+        }
+        return instant;
     }
 
     /**

src/main/java/org/joda/time/chrono/BasicYearDateTimeField.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2013 Stephen Colebourne
+ *  Copyright 2001-2015 Stephen Colebourne
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -85,6 +85,13 @@ public long set(long instant, int year) {
         return iChronology.setYear(instant, year);
     }
 
+    @Override
+    public long setExtended(long instant, int year) {
+        FieldUtils.verifyValueBounds(
+                this, year, iChronology.getMinYear() - 1, iChronology.getMaxYear() + 1);
+        return iChronology.setYear(instant, year);
+    }
+
     public long getDifferenceAsLong(long minuendInstant, long subtrahendInstant) {
         if (minuendInstant < subtrahendInstant) {
             return -iChronology.getYearDifference(subtrahendInstant, minuendInstant);

src/main/java/org/joda/time/chrono/ZonedChronology.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2013 Stephen Colebourne
+ *  Copyright 2001-2015 Stephen Colebourne
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -135,9 +135,19 @@ public long getDateTimeMillis(long instant,
      * @return the instant from 1970-01-01T00:00:00Z
      */
     private long localToUTC(long localInstant) {
+        if (localInstant == Long.MAX_VALUE) {
+            return Long.MAX_VALUE;
+        } else if (localInstant == Long.MIN_VALUE) {
+            return Long.MIN_VALUE;
+        }
         DateTimeZone zone = getZone();
         int offset = zone.getOffsetFromLocal(localInstant);
         long utcInstant = localInstant - offset;
+        if (localInstant > 0 && utcInstant < 0) {
+            return Long.MAX_VALUE;
+        } else if (localInstant < 0 && utcInstant > 0) {
+            return Long.MIN_VALUE;
+        }
         int offsetBasedOnUtc = zone.getOffset(utcInstant);
         if (offset != offsetBasedOnUtc) {
             throw new IllegalInstantException(localInstant, zone.getID());

src/main/java/org/joda/time/format/DateTimeParserBucket.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2014 Stephen Colebourne
+ *  Copyright 2001-2015 Stephen Colebourne
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -565,7 +565,7 @@ void init(DateTimeField field, String text, Locale locale) {
 
         long set(long millis, boolean reset) {
             if (iText == null) {
-                millis = iField.set(millis, iValue);
+                millis = iField.setExtended(millis, iValue);
             } else {
                 millis = iField.set(millis, iText, iLocale);
             }

src/test/java/org/joda/time/TestAll.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2010 Stephen Colebourne
+ *  Copyright 2001-2015 Stephen Colebourne
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -129,6 +129,7 @@ public static Test suite() {
         suite.addTest(TestStringConvert.suite());
         suite.addTest(TestSerialization.suite());
         suite.addTest(TestIllegalFieldValueException.suite());
+        suite.addTest(TestMinMaxLong.suite());
         return suite;
     }
 

src/test/java/org/joda/time/TestDateTime_Constructors.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2010 Stephen Colebourne
+ *  Copyright 2001-2015 Stephen Colebourne
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -243,36 +243,6 @@ public void testConstructor_long2() throws Throwable {
         assertEquals(TEST_TIME2, test.getMillis());
     }
 
-    /**
-     * Test constructor (long)
-     */
-    public void testConstructor_long_max() throws Throwable {
-        DateTime dt = new DateTime(292278993, 12, 31, 23, 59, 59, 999);
-        DateTime test = new DateTime(dt.getMillis());
-        assertEquals(dt, test);
-        try {
-            new DateTime(dt.getMillis() + 1);
-            fail();
-        } catch (IllegalFieldValueException ex) {
-            // expected
-        }
-    }
-
-    /**
-     * Test constructor (long)
-     */
-    public void testConstructor_long_min() throws Throwable {
-        DateTime dt = new DateTime(-292275054, 1, 1, 0, 0);
-        DateTime test = new DateTime(dt.getMillis());
-        assertEquals(dt, test);
-        try {
-            new DateTime(dt.getMillis() - 1);
-            fail();
-        } catch (IllegalFieldValueException ex) {
-            // expected
-        }
-    }
-
     /**
      * Test constructor (long, DateTimeZone)
      */

src/test/java/org/joda/time/TestInterval_Constructors.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2006 Stephen Colebourne
+ *  Copyright 2001-2015 Stephen Colebourne
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -177,6 +177,56 @@ public void testConstructor_long_long3() throws Throwable {
         } catch (IllegalArgumentException ex) {}
     }
 
+    public void testConstructor_long_long_minMax() throws Throwable {
+        Interval test = new Interval(Long.MIN_VALUE, Long.MAX_VALUE);
+        assertEquals(Long.MIN_VALUE, test.getStartMillis());
+        assertEquals(Long.MAX_VALUE, test.getEndMillis());
+        assertEquals(new DateTime(Long.MIN_VALUE), test.getStart());
+        assertEquals(new DateTime(Long.MAX_VALUE), test.getEnd());
+        assertEquals(ISOChronology.getInstance(), test.getChronology());
+        assertEquals(test, test.toInterval());
+        assertEquals("-292275055-05-16T16:56:25.192+00:09:21/292278994-08-17T07:12:55.807Z", test.toString());
+        try {
+            test.toDuration();
+            fail();
+        } catch (ArithmeticException ex) {}
+        try {
+            test.toDurationMillis();
+            fail();
+        } catch (ArithmeticException ex) {}
+        try {
+            test.toPeriod();
+            fail();
+        } catch (RuntimeException ex) {}
+    }
+
+    public void testConstructor_long_long_min() throws Throwable {
+        Interval test = new Interval(Long.MIN_VALUE, Long.MIN_VALUE + 9);
+        assertEquals(Long.MIN_VALUE, test.getStartMillis());
+        assertEquals(Long.MIN_VALUE + 9, test.getEndMillis());
+        assertEquals(new DateTime(Long.MIN_VALUE), test.getStart());
+        assertEquals(new DateTime(Long.MIN_VALUE + 9), test.getEnd());
+        assertEquals(ISOChronology.getInstance(), test.getChronology());
+        assertEquals(test, test.toInterval());
+        assertEquals("-292275055-05-16T16:56:25.192+00:09:21/-292275055-05-16T16:56:25.201+00:09:21", test.toString());
+        assertEquals(9, test.toDurationMillis());
+        assertEquals(new Duration(9), test.toDuration());
+        assertEquals(new Period(9), test.toPeriod());
+    }
+
+    public void testConstructor_long_long_max() throws Throwable {
+        Interval test = new Interval(Long.MAX_VALUE - 9, Long.MAX_VALUE);
+        assertEquals(Long.MAX_VALUE - 9, test.getStartMillis());
+        assertEquals(Long.MAX_VALUE, test.getEndMillis());
+        assertEquals(new DateTime(Long.MAX_VALUE - 9), test.getStart());
+        assertEquals(new DateTime(Long.MAX_VALUE), test.getEnd());
+        assertEquals(ISOChronology.getInstance(), test.getChronology());
+        assertEquals(test, test.toInterval());
+        assertEquals("292278994-08-17T07:12:55.798Z/292278994-08-17T07:12:55.807Z", test.toString());
+        assertEquals(9, test.toDurationMillis());
+        assertEquals(new Duration(9), test.toDuration());
+    }
+
     //-----------------------------------------------------------------------
     public void testConstructor_long_long_Zone() throws Throwable {
         DateTime dt1 = new DateTime(2004, 6, 9, 0, 0, 0, 0);