Annotate much of java.time for nullness.

Author: cpovirk

src/java.base/share/classes/java/time/Clock.java

@@ -66,6 +66,7 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.checkerframework.dataflow.qual.Pure;
 import org.checkerframework.dataflow.qual.SideEffectFree;
+import org.checkerframework.framework.qual.AnnotatedFor;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -143,6 +144,7 @@
  *
  * @since 1.8
  */
+@AnnotatedFor({"nullness"})
 public abstract class Clock {
 
     /**

src/java.base/share/classes/java/time/DateTimeException.java

@@ -61,6 +61,10 @@
  */
 package java.time;
 
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.checkerframework.dataflow.qual.SideEffectFree;
+import org.checkerframework.framework.qual.AnnotatedFor;
+
 /**
  * Exception used to indicate a problem while calculating a date-time.
  * <p>
@@ -72,6 +76,7 @@
  *
  * @since 1.8
  */
+@AnnotatedFor({"nullness"})
 public class DateTimeException extends RuntimeException {
 
     /**
@@ -84,7 +89,8 @@ public class DateTimeException extends RuntimeException {
      *
      * @param message  the message to use for this exception, may be null
      */
-    public DateTimeException(String message) {
+    @SideEffectFree
+    public DateTimeException(@Nullable String message) {
         super(message);
     }
 
@@ -94,7 +100,8 @@ public DateTimeException(String message) {
      * @param message  the message to use for this exception, may be null
      * @param cause  the cause of the exception, may be null
      */
-    public DateTimeException(String message, Throwable cause) {
+    @SideEffectFree
+    public DateTimeException(@Nullable String message, @Nullable Throwable cause) {
         super(message, cause);
     }
 

src/java.base/share/classes/java/time/DayOfWeek.java

@@ -64,6 +64,9 @@
 import static java.time.temporal.ChronoField.DAY_OF_WEEK;
 import static java.time.temporal.ChronoUnit.DAYS;
 
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.checkerframework.framework.qual.AnnotatedFor;
+
 import java.time.format.DateTimeFormatterBuilder;
 import java.time.format.TextStyle;
 import java.time.temporal.ChronoField;
@@ -106,6 +109,7 @@
  *
  * @since 1.8
  */
+@AnnotatedFor({"nullness"})
 public enum DayOfWeek implements TemporalAccessor, TemporalAdjuster {
 
     /**
@@ -248,7 +252,7 @@ public String getDisplayName(TextStyle style, Locale locale) {
      * @return true if the field is supported on this day-of-week, false if not
      */
     @Override
-    public boolean isSupported(TemporalField field) {
+    public boolean isSupported(@Nullable TemporalField field) {
         if (field instanceof ChronoField) {
             return field == DAY_OF_WEEK;
         }

src/java.base/share/classes/java/time/Duration.java

@@ -66,6 +66,7 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.checkerframework.dataflow.qual.Pure;
 import org.checkerframework.dataflow.qual.SideEffectFree;
+import org.checkerframework.framework.qual.AnnotatedFor;
 
 import static java.time.LocalTime.MINUTES_PER_HOUR;
 import static java.time.LocalTime.NANOS_PER_MILLI;
@@ -136,6 +137,7 @@
  *
  * @since 1.8
  */
+@AnnotatedFor({"nullness"})
 public final class Duration
         implements TemporalAmount, Comparable<Duration>, Serializable {
 

src/java.base/share/classes/java/time/Instant.java

@@ -66,6 +66,7 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.checkerframework.dataflow.qual.Pure;
 import org.checkerframework.dataflow.qual.SideEffectFree;
+import org.checkerframework.framework.qual.AnnotatedFor;
 
 import static java.time.LocalTime.NANOS_PER_SECOND;
 import static java.time.LocalTime.SECONDS_PER_DAY;
@@ -210,6 +211,7 @@
  *
  * @since 1.8
  */
+@AnnotatedFor({"nullness"})
 public final class Instant
         implements Temporal, TemporalAdjuster, Comparable<Instant>, Serializable {
 
@@ -460,7 +462,7 @@ private Instant(long epochSecond, int nanos) {
      * @return true if the field is supported on this instant, false if not
      */
     @Override
-    public boolean isSupported(TemporalField field) {
+    public boolean isSupported(@Nullable TemporalField field) {
         if (field instanceof ChronoField) {
             return field == INSTANT_SECONDS || field == NANO_OF_SECOND || field == MICRO_OF_SECOND || field == MILLI_OF_SECOND;
         }
@@ -497,7 +499,7 @@ public boolean isSupported(TemporalField field) {
      * @return true if the unit can be added/subtracted, false if not
      */
     @Override
-    public boolean isSupported(TemporalUnit unit) {
+    public boolean isSupported(@Nullable TemporalUnit unit) {
         if (unit instanceof ChronoUnit) {
             return unit.isTimeBased() || unit == DAYS;
         }

src/java.base/share/classes/java/time/LocalDate.java

@@ -66,6 +66,7 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.checkerframework.dataflow.qual.Pure;
 import org.checkerframework.dataflow.qual.SideEffectFree;
+import org.checkerframework.framework.qual.AnnotatedFor;
 
 import static java.time.LocalTime.SECONDS_PER_DAY;
 import static java.time.temporal.ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH;
@@ -142,6 +143,7 @@
  *
  * @since 1.8
  */
+@AnnotatedFor({"nullness"})
 public final class LocalDate
         implements Temporal, TemporalAdjuster, ChronoLocalDate, Serializable {
 
@@ -542,7 +544,7 @@ private LocalDate(int year, int month, int dayOfMonth) {
      * @return true if the field is supported on this date, false if not
      */
     @Override  // override for Javadoc
-    public boolean isSupported(TemporalField field) {
+    public boolean isSupported(@Nullable TemporalField field) {
         return ChronoLocalDate.super.isSupported(field);
     }
 
@@ -576,7 +578,7 @@ public boolean isSupported(TemporalField field) {
      * @return true if the unit can be added/subtracted, false if not
      */
     @Override  // override for Javadoc
-    public boolean isSupported(TemporalUnit unit) {
+    public boolean isSupported(@Nullable TemporalUnit unit) {
         return ChronoLocalDate.super.isSupported(unit);
     }
 

src/java.base/share/classes/java/time/LocalDateTime.java

@@ -66,6 +66,7 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.checkerframework.dataflow.qual.Pure;
 import org.checkerframework.dataflow.qual.SideEffectFree;
+import org.checkerframework.framework.qual.AnnotatedFor;
 
 import static java.time.LocalTime.HOURS_PER_DAY;
 import static java.time.LocalTime.MICROS_PER_DAY;
@@ -138,6 +139,7 @@
  *
  * @since 1.8
  */
+@AnnotatedFor({"nullness"})
 public final class LocalDateTime
         implements Temporal, TemporalAdjuster, ChronoLocalDateTime<LocalDate>, Serializable {
 
@@ -577,7 +579,7 @@ private LocalDateTime with(LocalDate newDate, LocalTime newTime) {
      * @return true if the field is supported on this date-time, false if not
      */
     @Override
-    public boolean isSupported(TemporalField field) {
+    public boolean isSupported(@Nullable TemporalField field) {
         if (field instanceof ChronoField) {
             ChronoField f = (ChronoField) field;
             return f.isDateBased() || f.isTimeBased();
@@ -622,7 +624,7 @@ public boolean isSupported(TemporalField field) {
      * @return true if the unit can be added/subtracted, false if not
      */
     @Override  // override for Javadoc
-    public boolean isSupported(TemporalUnit unit) {
+    public boolean isSupported(@Nullable TemporalUnit unit) {
         return ChronoLocalDateTime.super.isSupported(unit);
     }
 

src/java.base/share/classes/java/time/LocalTime.java

@@ -66,6 +66,7 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.checkerframework.dataflow.qual.Pure;
 import org.checkerframework.dataflow.qual.SideEffectFree;
+import org.checkerframework.framework.qual.AnnotatedFor;
 
 import static java.time.temporal.ChronoField.HOUR_OF_DAY;
 import static java.time.temporal.ChronoField.MICRO_OF_DAY;
@@ -128,6 +129,7 @@
  *
  * @since 1.8
  */
+@AnnotatedFor({"nullness"})
 public final class LocalTime
         implements Temporal, TemporalAdjuster, Comparable<LocalTime>, Serializable {
 
@@ -542,7 +544,7 @@ private LocalTime(int hour, int minute, int second, int nanoOfSecond) {
      * @return true if the field is supported on this time, false if not
      */
     @Override
-    public boolean isSupported(TemporalField field) {
+    public boolean isSupported(@Nullable TemporalField field) {
         if (field instanceof ChronoField) {
             return field.isTimeBased();
         }
@@ -578,7 +580,7 @@ public boolean isSupported(TemporalField field) {
      * @return true if the unit can be added/subtracted, false if not
      */
     @Override  // override for Javadoc
-    public boolean isSupported(TemporalUnit unit) {
+    public boolean isSupported(@Nullable TemporalUnit unit) {
         if (unit instanceof ChronoUnit) {
             return unit.isTimeBased();
         }

src/java.base/share/classes/java/time/Month.java

@@ -64,6 +64,9 @@
 import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
 import static java.time.temporal.ChronoUnit.MONTHS;
 
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.checkerframework.framework.qual.AnnotatedFor;
+
 import java.time.chrono.Chronology;
 import java.time.chrono.IsoChronology;
 import java.time.format.DateTimeFormatterBuilder;
@@ -103,6 +106,7 @@
  *
  * @since 1.8
  */
+@AnnotatedFor({"nullness"})
 public enum Month implements TemporalAccessor, TemporalAdjuster {
 
     /**
@@ -275,7 +279,7 @@ public String getDisplayName(TextStyle style, Locale locale) {
      * @return true if the field is supported on this month-of-year, false if not
      */
     @Override
-    public boolean isSupported(TemporalField field) {
+    public boolean isSupported(@Nullable TemporalField field) {
         if (field instanceof ChronoField) {
             return field == MONTH_OF_YEAR;
         }

src/java.base/share/classes/java/time/MonthDay.java

@@ -66,6 +66,7 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.checkerframework.dataflow.qual.Pure;
 import org.checkerframework.dataflow.qual.SideEffectFree;
+import org.checkerframework.framework.qual.AnnotatedFor;
 
 import static java.time.temporal.ChronoField.DAY_OF_MONTH;
 import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
@@ -130,6 +131,7 @@
  *
  * @since 1.8
  */
+@AnnotatedFor({"nullness"})
 public final class MonthDay
         implements TemporalAccessor, TemporalAdjuster, Comparable<MonthDay>, Serializable {
 
@@ -352,7 +354,7 @@ private MonthDay(int month, int dayOfMonth) {
      * @return true if the field is supported on this month-day, false if not
      */
     @Override
-    public boolean isSupported(TemporalField field) {
+    public boolean isSupported(@Nullable TemporalField field) {
         if (field instanceof ChronoField) {
             return field == MONTH_OF_YEAR || field == DAY_OF_MONTH;
         }